Skip to content

Commit 16c0791

Browse files
committed
chore: update MahApps.Metro to v3.0.0-alpha0492
1 parent 22110d6 commit 16c0791

File tree

6 files changed

+79
-324
lines changed

6 files changed

+79
-324
lines changed

src/IconPacks.Browser/Controls/SideBar.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,12 @@
9797
<ctrls:CopyToClipboardTextBox TextToCopy="{Binding SelectedIcon.Description}" />
9898
</mah:MetroHeader>
9999
<mah:MetroHeader Header="Homepage">
100-
<TextBox Style="{DynamicResource IconPacksBrowser.Styles.TextBox.Hyperlink}" Text="{Binding SelectedIcon.MetaData.ProjectUrl, Mode=OneWay}" />
100+
<TextBox Style="{DynamicResource IconPacksBrowser.Styles.TextBox.Hyperlink}"
101+
Text="{Binding SelectedIcon.MetaData.ProjectUrl, Mode=OneWay}" />
101102
</mah:MetroHeader>
102103
<mah:MetroHeader Header="License URL">
103-
<TextBox Style="{DynamicResource IconPacksBrowser.Styles.TextBox.Hyperlink}" Text="{Binding SelectedIcon.MetaData.LicenseUrl, Mode=OneWay}" />
104+
<TextBox Style="{DynamicResource IconPacksBrowser.Styles.TextBox.Hyperlink}"
105+
Text="{Binding SelectedIcon.MetaData.LicenseUrl, Mode=OneWay}" />
104106
</mah:MetroHeader>
105107
</StackPanel>
106108
</Expander>

src/IconPacks.Browser/IconPacks.Browser.csproj

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,21 @@
2626
</PackageReference>
2727
<PackageReference Include="MahApps.Metro.IconPacks" Version="5.0.0" />
2828
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
29+
<PackageReference Include="MahApps.Metro" Version="3.0.0-alpha0492" />
2930
<PackageReference Include="AsyncAwaitBestPractices.MVVM" Version="8.0.0" />
3031
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
3132
<PackageReference Include="VirtualizingWrapPanel" Version="2.0.11" />
32-
</ItemGroup>
33-
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == true">
34-
<PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
35-
<PackageReference Include="MaterialDesignColors" Version="2.0.9" />
36-
</ItemGroup>
37-
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
38-
<PackageReference Include="MaterialDesignThemes" Version="3.0.1" />
39-
<PackageReference Include="MaterialDesignColors" Version="1.2.7" />
33+
34+
<PackageReference Include="MaterialDesignThemes" Version="3.0.1" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
35+
<PackageReference Include="MaterialDesignColors" Version="1.2.7" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
36+
<PackageReference Include="MaterialDesignThemes" Version="4.9.0" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
37+
<PackageReference Include="MaterialDesignColors" Version="2.1.4" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
4038
</ItemGroup>
4139

4240
<ItemGroup>
4341
<_SettingsFiles Remove="Properties\Settings.settings" />
4442
<None Update="ExportTemplates\Clipboard.WPF.Geometry.xml">
45-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
43+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4644
</None>
4745
<None Update="ExportTemplates\Clipboard.Content.xml">
4846
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -73,4 +71,4 @@
7371
</None>
7472
</ItemGroup>
7573

76-
</Project>
74+
</Project>

src/IconPacks.Browser/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
d:DesignWidth="600"
2020
mah:DialogParticipation.Register="{Binding}"
2121
BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
22-
BorderThickness="1"
22+
GlowColor="{DynamicResource MahApps.Colors.Accent}"
2323
ResizeMode="CanResizeWithGrip"
2424
TitleCharacterCasing="Normal"
2525
WindowStartupLocation="CenterScreen"

0 commit comments

Comments
 (0)