From: jpbruyere <jp.bruyere@hotmail.com>
Date: Tue, 13 Sep 2016 09:46:07 +0000 (+0200)
Subject: simplified SizePolicy check
X-Git-Tag: v0.9.5-beta~259^2~28
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=8edb058b753532a17002c2e851c483a63d839e24;p=jp%2Fcrow.git

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 03e8a362..ffa2d480 100644
--- 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 19e8f548..c9b08f22 100644
--- 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;