From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Tue, 2 Mar 2021 10:49:56 +0000 (+0100)
Subject: debug privateContainer sizing
X-Git-Tag: v0.9.5-beta~66
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=5b5150e5e7e1eca0aa99de8b8a7aa6f38b7310d8;p=jp%2Fcrow.git

debug privateContainer sizing
---

diff --git a/Crow/Templates/Button.template b/Crow/Templates/Button.template
index e9764460..c46da8c6 100644
--- a/Crow/Templates/Button.template
+++ b/Crow/Templates/Button.template
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Border Background="{./Background}" Name="Content" Width="Stretched" Height="Stretched"
+<Border Background="{./Background}" Name="Content"
 	Foreground="Transparent" CornerRadius="{../CornerRadius}" BorderWidth="1"
 	MouseEnter="{Foreground=vgradient|0:White|0.2:Grey|0.9:Grey|1:Black};{caption.Foreground=White}"
 	MouseLeave="{Foreground=Transparent};{caption.Foreground=LightGrey}"
diff --git a/Crow/Templates/GroupBox.template b/Crow/Templates/GroupBox.template
index cc444567..1cc48774 100644
--- a/Crow/Templates/GroupBox.template
+++ b/Crow/Templates/GroupBox.template
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Container Background="{./Background}" >
+<Container Background="{./Background}">
 	<Group CacheEnabled="true">
 		<VerticalStack Spacing="0">
 			<Widget Height="6"/>
diff --git a/Crow/src/Widgets/PrivateContainer.cs b/Crow/src/Widgets/PrivateContainer.cs
index b71b9c8d..bb0bf531 100644
--- a/Crow/src/Widgets/PrivateContainer.cs
+++ b/Crow/src/Widgets/PrivateContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2013-2019  Bruyère Jean-Philippe <jp_bruyere@hotmail.com>
+// Copyright (c) 2013-2021  Bruyère Jean-Philippe <jp_bruyere@hotmail.com>
 //
 // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
 
@@ -112,7 +112,7 @@ namespace Crow
 					break;
 				case LayoutingType.Height:
 					if (child.Height.IsRelativeToParent)
-						contentSize.Height = child.measureRawSize (LayoutingType.Width);
+						contentSize.Height = child.measureRawSize (LayoutingType.Height);
 					break;
 				}
 			}
@@ -131,7 +131,7 @@ namespace Crow
 				case LayoutingType.Height:
 					if (Height == Measure.Fit && child.Height.IsRelativeToParent)
 						//child.Height = Measure.Fit;
-						contentSize.Height = child.measureRawSize (LayoutingType.Width);
+						contentSize.Height = child.measureRawSize (LayoutingType.Height);
 					break;
 				}
 			}