Merge branch 'master' into CrowIDE

2 files changed, 13 insertions, 5 deletions

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 093664d1..e69aaaca 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -276,9 +276,13 @@ namespace Crow
 				Width = Height = Measure.Fit;
 			}
 		}
-		[XmlAttributeAttribute()][DefaultValue("Stretched")]
+		[XmlAttributeAttribute()][DefaultValue("Inherit")]
 		public virtual Measure Width {
-			get { return width; }
+			get {
+				return width.Units == Unit.Inherit ?
+					Parent is GraphicObject ? (Parent as GraphicObject).WidthPolicy :
+					Measure.Stretched : width;
+			}
 			set {
 				if (width == value)
 					return;
@@ -308,9 +312,13 @@ namespace Crow
 				this.RegisterForLayouting (LayoutingType.Width);
 			}
 		}
-		[XmlAttributeAttribute()][DefaultValue("Stretched")]
+		[XmlAttributeAttribute()][DefaultValue("Inherit")]
 		public virtual Measure Height {
-			get { return height; }
+			get {
+				return height.Units == Unit.Inherit ?
+					Parent is GraphicObject ? (Parent as GraphicObject).HeightPolicy :
+					Measure.Stretched : height;
+			}
 			set {
 				if (height == value)
 					return;
diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs
index 1bfdf19c..669b8d7f 100644
--- a/src/GraphicObjects/Popper.cs
+++ b/src/GraphicObjects/Popper.cs
@@ -119,7 +119,7 @@ namespace Crow
 
 		protected void _content_LayoutChanged (object sender, LayoutingEventArgs e)
 		{
-			ILayoutable tc = Content.Parent as ILayoutable;
+			ILayoutable tc = Content.Parent;
 			if (tc == null)
 				return;
 			Rectangle r = this.ScreenCoordinates (this.Slot);