diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-07-30 12:42:25 +0200 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-07-30 12:42:25 +0200 |
| commit | 6c6fb760bfb6a956a3413abfb56571a11113acd3 (patch) | |
| tree | 63bfcb046c0eedbacc6412ed6c03595db3acc557 /src/GraphicObjects/GraphicObject.cs | |
| parent | dca4d91d401ba718eccb83d6be42a12f55919838 (diff) | |
replace ';' separator between members by ',' and set '.' as decimal mark in files
Diffstat (limited to 'src/GraphicObjects/GraphicObject.cs')
| -rw-r--r-- | src/GraphicObjects/GraphicObject.cs | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index 433599c1..3eaa91f1 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -82,8 +82,8 @@ namespace Crow protected bool _isVisible = true; VerticalAlignment _verticalAlignment = VerticalAlignment.Center; HorizontalAlignment _horizontalAlignment = HorizontalAlignment.Center; - Size _maximumSize = "0;0"; - Size _minimumSize = "0;0"; + Size _maximumSize = "0,0"; + Size _minimumSize = "0,0"; bool cacheEnabled = false; object dataSource; string style; @@ -419,7 +419,7 @@ namespace Crow NotifyValueChanged ("Visible", _isVisible); } } - [XmlAttributeAttribute()][DefaultValue("1;1")] + [XmlAttributeAttribute()][DefaultValue("1,1")] public virtual Size MinimumSize { get { return _minimumSize; } set { @@ -432,7 +432,7 @@ namespace Crow RegisterForLayouting (LayoutingType.Sizing); } } - [XmlAttributeAttribute()][DefaultValue("0;0")] + [XmlAttributeAttribute()][DefaultValue("0,0")] public virtual Size MaximumSize { get { return _maximumSize; } set { @@ -539,9 +539,15 @@ namespace Crow else name = xaa.AttributeName; } - if (styling.ContainsKey (name)) { - } else { + bool memberHasStyle = false; + if (styling != null){ + if (styling.ContainsKey (name)) + memberHasStyle = true; + } + if (memberHasStyle){ + + }else { if (name == "Style") { //retrieve default value from class attribute //DefaultStyle defStyle = thisType.GetCustomAttribute<DefaultStyle>(); |