simplified SizePolicy check

	modifié :         src/GraphicObjects/GraphicObject.cs
	modifié :         src/Measure.cs

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 03e8a362647d8e8865af024fb41448038cb30ced..ffa2d4809b2767aec38b0e85c0d9dd455ae87110 100644 (file)
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -341,15 +341,13 @@ namespace Crow
                /// Fit or Stretched
                /// </summary>
                [XmlIgnore]public virtual Measure WidthPolicy { get {
-                               return Width.Units == Unit.Percent || Width.IsFixed ?
-                                       Measure.Stretched : Measure.Fit; } }
+                               return Width.IsFit ? Measure.Fit : Measure.Stretched; } }
                /// <summary>
                /// Used for binding on dimensions, this property will never hold fixed size, but instead only
                /// Fit or Stretched
                /// </summary>
                [XmlIgnore]public virtual Measure HeightPolicy { get {
-                               return Height.Units == Unit.Percent || Height.IsFixed ?
-                                       Measure.Stretched : Measure.Fit; } }
+                               return Height.IsFit ? Measure.Fit : Measure.Stretched; } }
                [XmlAttributeAttribute()][DefaultValue(false)]
                public virtual bool Focusable {
                        get { return focusable; }

diff --git a/src/Measure.cs b/src/Measure.cs
index 19e8f548651760c72c347711e34e5f6d8b52e24b..c9b08f228e35c4da50759b2a589d6d7938305ac2 100644 (file)
--- a/src/Measure.cs
+++ b/src/Measure.cs
@@ -62,7 +62,7 @@ namespace Crow
                /// True is size is fixed in pixels, this means not proportional, stretched nor fit.
                /// </summary>
                public bool IsFixed { get { return Value > 0 && Units == Unit.Pixel; }}
-
+               public bool IsFit { get { return Value == -1 && Units == Unit.Pixel; }}
                #region Operators
                public static implicit operator int(Measure m){
                        return m.Value;