Merge pull request #4396 from batzen/feature/UpdateControlzEx

Updating ControlzEx and using padding as margin for window content
MahApps · Apr 18, 2023 · b4f4274 · b4f4274
2 parents 317b9bc + 93f9f80
commit b4f4274
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Directory.packages.props b/src/Directory.packages.props
@@ -4,7 +4,7 @@
         <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     </PropertyGroup>
     <ItemGroup>
-        <PackageVersion Include="ControlzEx" Version="6.0.0-alpha0272" />
+        <PackageVersion Include="ControlzEx" Version="6.0.0-alpha0280" />
         <PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0143" />
         <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     </ItemGroup>

diff --git a/src/MahApps.Metro/Themes/MetroWindow.xaml b/src/MahApps.Metro/Themes/MetroWindow.xaml
@@ -19,7 +19,8 @@
                         BorderBrush="{Binding Path=GlowColor, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static mahConverters:ColorToSolidColorBrushConverter.DefaultInstance}}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
-                        UseLayoutRounding="True">
+                        UseLayoutRounding="True"
+                        Margin="{TemplateBinding Padding}">
             <AdornerDecorator UseLayoutRounding="False">
                 <Grid Background="{x:Null}"
                       LayoutTransform="{Binding LayoutTransform, RelativeSource={RelativeSource TemplatedParent}}"
@@ -264,7 +265,8 @@
                         BorderBrush="{Binding Path=GlowColor, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static mahConverters:ColorToSolidColorBrushConverter.DefaultInstance}}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
-                        UseLayoutRounding="True">
+                        UseLayoutRounding="True"
+                        Margin="{TemplateBinding Padding}">
             <AdornerDecorator UseLayoutRounding="False">
                 <Grid Background="{x:Null}"
                       LayoutTransform="{Binding LayoutTransform, RelativeSource={RelativeSource TemplatedParent}}"