Skip to content

Commit 99af337

Browse files
punker76punker76
committed
chore: update to latest MahApps alpha version
1 parent dca1810 commit 99af337

File tree

18 files changed

+1324
-46
lines changed

18 files changed

+1324
-46
lines changed

‎Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<!-- Project properties -->
44
<PropertyGroup>
5-
<TargetFrameworks>net472;netcoreapp3.1;net5.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net8.0-windows;net6.0-windows;net462</TargetFrameworks>
66
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
77
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
88
<GenerateDocumentationFile>false</GenerateDocumentationFile>
9-
<LangVersion>9.0</LangVersion>
9+
<LangVersion>10.0</LangVersion>
1010
<DebugSymbols>true</DebugSymbols>
1111
<DebugType>full</DebugType>
1212
<UseWPF>true</UseWPF>
@@ -20,8 +20,8 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<None Remove="**\*.png;**\*.jpg;**\*.ico;**\*.ttf" />
24-
<Resource Include="**\*.png;**\*.jpg;**\*.ico;**\*.ttf" />
23+
<None Remove="**\*.bmp;**\*.cur;**\*.gif;**\*.ico;**\*.jpg;**\*.png;**\*.ttf"/>
24+
<Resource Include="**\*.bmp;**\*.cur;**\*.gif;**\*.ico;**\*.jpg;**\*.png;**\*.ttf" Exclude="**\bin\**\*.*;**\obj\**\*.*"/>
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎Directory.Packages.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<PackageVersion Include="JetBrains.Annotations" Version="2021.2.0" PrivateAssets="All" IncludeAssets="build;compile" />
5-
<PackageVersion Include="WpfAnalyzers" Version="3.5.4">
4+
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" IncludeAssets="build;compile" />
5+
<PackageVersion Include="WpfAnalyzers" Version="4.1.1">
66
<PrivateAssets>all</PrivateAssets>
77
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
88
</PackageVersion>
99

10-
<PackageVersion Include="MahApps.Metro" Version="2.4.7" />
11-
<PackageVersion Include="ControlzEx" Version="4.4.0" />
12-
<PackageVersion Include="MahApps.Metro.IconPacks" Version="4.10.0" />
13-
<PackageVersion Include="MahApps.Metro.IconPacks.BoxIcons" Version="4.10.0" />
14-
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.10.0" />
15-
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="4.10.0" />
16-
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="4.10.0" />
17-
<PackageVersion Include="Extended.Wpf.Toolkit" Version="4.1.0" />
10+
<PackageVersion Include="MahApps.Metro" Version="3.0.0-alpha0492" />
11+
<PackageVersion Include="ControlzEx" Version="7.0.0-alpha0021" />
12+
<PackageVersion Include="MahApps.Metro.IconPacks" Version="4.11.0" />
13+
<PackageVersion Include="MahApps.Metro.IconPacks.BoxIcons" Version="4.11.0" />
14+
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
15+
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="4.11.0" />
16+
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="4.11.0" />
17+
<PackageVersion Include="Extended.Wpf.Toolkit" Version="4.6.0" />
1818
</ItemGroup>
1919
</Project>

‎ListViewSwitchItemsPanel/ListViewSample_ffi3tk3x_wpftmp.csproj

Lines changed: 227 additions & 0 deletions
Large diffs are not rendered by default.

‎MahAppsMetroDataGridSample/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Title="MahApps.Metro DataGrid Sample"
99
Width="670"
1010
Height="350"
11-
GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
11+
GlowColor="{DynamicResource MahApps.Colors.Accent}"
1212
mc:Ignorable="d">
1313

1414
<mah:MetroWindow.Resources>

‎MahAppsMetroFullScreen/MainWindow.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
Title="MainWindow"
88
BorderThickness="1"
9-
GlowBrush="{DynamicResource MahApps.Brushes.AccentBase}"
9+
GlowColor="{DynamicResource MahApps.Colors.AccentBase}"
1010
WindowStartupLocation="CenterScreen"
11-
WindowState="Maximized"
12-
UseNoneWindowStyle="True"
13-
IgnoreTaskbarOnMaximize="True"
1411
Width="525"
1512
Height="350"
1613
mc:Ignorable="d">

‎MahAppsMetroFullScreen/MainWindow.xaml.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,24 @@ public partial class MainWindow : MetroWindow
1111
public MainWindow()
1212
{
1313
InitializeComponent();
14+
this.Loaded += MainWindow_Loaded;
15+
}
16+
17+
private void MainWindow_Loaded(object sender, RoutedEventArgs e)
18+
{
19+
this.SetCurrentValue(WindowStateProperty, WindowState.Maximized);
20+
this.SetCurrentValue(IgnoreTaskbarOnMaximizeProperty, true);
1421
}
1522

1623
private void FullClick(object sender, RoutedEventArgs e)
1724
{
1825
this.SetCurrentValue(WindowStateProperty, WindowState.Maximized);
19-
this.SetCurrentValue(UseNoneWindowStyleProperty, true);
2026
this.SetCurrentValue(IgnoreTaskbarOnMaximizeProperty, true);
2127
}
2228

2329
private void NormalClick(object sender, RoutedEventArgs e)
2430
{
2531
this.SetCurrentValue(WindowStateProperty, WindowState.Normal);
26-
this.SetCurrentValue(UseNoneWindowStyleProperty, false);
27-
this.SetCurrentValue(ShowTitleBarProperty, true); // <-- this must be set to true
2832
this.SetCurrentValue(IgnoreTaskbarOnMaximizeProperty, false);
2933
}
3034
}

‎MahAppsMetroHamburgerMenuNavigation/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Title="MainWindow"
1010
Width="600"
1111
Height="450"
12-
GlowBrush="{DynamicResource MahApps.Brushes.AccentBase}"
12+
GlowColor="{DynamicResource MahApps.Colors.AccentBase}"
1313
WindowStartupLocation="CenterScreen"
1414
WindowTransitionsEnabled="False"
1515
mc:Ignorable="d">

0 commit comments

Comments
 (0)