Skip to content

Commit 4295fe8

Browse files
committed
chore: Updating to final v7 of ControlzEx
1 parent fc85bb8 commit 4295fe8

File tree

3 files changed

+19
-31
lines changed

3 files changed

+19
-31
lines changed

src/Directory.packages.props

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup Label="Build">
7-
<PackageVersion Include="ControlzEx" version="7.0.0-rc0118" />
8-
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
7+
<PackageVersion Include="ControlzEx" version="7.0.1-rc0014" />
98
<PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0167" />
10-
<PackageVersion Include="JetBrains.Annotations" Version="2024.2.0" />
9+
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
1110

12-
<PackageVersion Include="Caliburn.Micro" Version="4.0.212" />
11+
<PackageVersion Include="Caliburn.Micro" Version="4.0.230" />
1312

14-
<PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="5.0.1" />
15-
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.0.1" />
16-
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="5.0.1" />
17-
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="5.0.1" />
18-
<PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="5.0.1" />
13+
<PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="5.1.0" />
14+
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0" />
15+
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="5.1.0" />
16+
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="5.1.0" />
17+
<PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0" />
1918

2019
<PackageVersion Include="MaterialDesignThemes" Version="3.0.1" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
2120
<PackageVersion Include="MaterialDesignColors" Version="1.2.7" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
2221
<PackageVersion Include="MaterialDesignThemes" Version="4.9.0" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
2322
<PackageVersion Include="MaterialDesignColors" Version="2.1.4" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
2423

2524
<PackageVersion Include="NHotkey.Wpf" Version="3.0.0" />
26-
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
27-
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
25+
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3124.44" />
26+
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.162" />
2827

2928
<PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
3029
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
31-
<PackageVersion Include="System.Memory" Version="4.5.5" />
32-
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" Condition="'$(TargetFramework)' != 'net8.0-windows'" />
30+
<PackageVersion Include="System.Memory" Version="4.6.2" />
31+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.1" Condition="'$(TargetFramework)' != 'net8.0-windows'" />
3332

3433
<PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
3534
</ItemGroup>
35+
3636
<ItemGroup Label="Test">
37-
<PackageVersion Include="NUnit" Version="4.2.2" />
38-
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
39-
<PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
40-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
37+
<PackageVersion Include="NUnit" Version="4.3.2" />
38+
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
39+
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
40+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
4141
</ItemGroup>
4242
</Project>

src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,8 @@
285285
IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=ToggleFullScreen}" />
286286
<Separator />
287287
<MenuItem Click="MenuWindowWithGlowOnClick" Header="Window with Glow" />
288-
<MenuItem Click="MenuWindowWithoutGlowOnClick" Header="Window without Glow" />
289-
<MenuItem Click="MenuWindowWithBorderOnClick" Header="Window with Border (and Glow)" />
290-
<MenuItem Click="MenuWindowWithRoundedBorderOnClick" Header="Window with rounded Border (without Glow)" />
288+
<MenuItem Click="MenuWindowWithBorderOnClick" Header="Window with Glow and Border" />
289+
<MenuItem Click="MenuWindowWithRoundedBorderOnClick" Header="Window without Glow but with rounded Border" />
291290
<MenuItem Click="LaunchSizeToContentDemo" Header="Window with SizeToContent" />
292291
<Separator />
293292
<MenuItem x:Name="ShowSeparatorsMI"

src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -590,16 +590,5 @@ private void MenuWindowWithGlowOnClick(object sender, RoutedEventArgs e)
590590
w.Content = new Button { Content = "MetroWindow with Glow", ToolTip = "This is a tool tip", FontSize = 28, FontWeight = FontWeights.Light, VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center };
591591
w.Show();
592592
}
593-
594-
private void MenuWindowWithoutGlowOnClick(object sender, RoutedEventArgs e)
595-
{
596-
var w = this.GetTestWindow();
597-
w.Content = new TextBlock { Text = "MetroWindow without Glow", FontSize = 28, FontWeight = FontWeights.Light, VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center };
598-
w.GlowColor = null;
599-
w.NonActiveGlowColor = null;
600-
w.BorderThickness = new Thickness(1);
601-
w.WindowStyle = WindowStyle.None;
602-
w.Show();
603-
}
604593
}
605594
}

0 commit comments

Comments
 (0)