debug privateContainer sizing

diff --git a/Crow/Templates/Button.template b/Crow/Templates/Button.template
index e9764460993cf60092241ae444467c3178c6408d..c46da8c6b881bfdc4fbd76a69dd72d3c62215561 100644 (file)
--- 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 cc4445676410636ce2e28f20f066c7470f2dd3d5..1cc48774862ba6c812c7fda15b40cd659ad6d99a 100644 (file)
--- 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 b71b9c8dd074b148f208eb0b381e672c6e58e199..bb0bf53199886a472d11e2eda85aa25a4784099d 100644 (file)
--- 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;
                                }
                        }