Skip to content

Commit 5de3aa1

Browse files
NotYoojunNotYoojun
committed
Update header tiles
1 parent 034fcf6 commit 5de3aa1

File tree

3 files changed

+52
-44
lines changed

3 files changed

+52
-44
lines changed

‎source/iNKORE.UI.WPF.Modern.Gallery/Controls/HeaderTile.xaml‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,46 +11,45 @@
1111
Height="230"
1212
DataContext="{Binding RelativeSource={RelativeSource Self}}">
1313

14-
<Border
14+
<Border CornerRadius="8" Margin="0,0,12,12"
1515
Background="{DynamicResource AcrylicBackgroundFillColorDefaultBrush}"
16-
BorderBrush="{DynamicResource SurfaceStrokeColorFlyoutBrush}"
17-
CornerRadius="8"
18-
Margin="0,0,12,12">
16+
BorderBrush="{DynamicResource SurfaceStrokeColorFlyoutBrush}">
17+
<FrameworkElement.Resources>
18+
<ResourceDictionary>
19+
<ResourceDictionary.MergedDictionaries>
20+
<ui:ThemeResources CanBeAccessedAcrossThreads="{x:Static local:App.IsMultiThreaded}">
21+
<ui:ThemeResources.ThemeDictionaries>
22+
<ResourceDictionary x:Key="Light" ui:ThemeDictionary.Key="Light">
23+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrush" Color="{DynamicResource {x:Static ui:ThemeKeys.ControlStrokeColorDefaultKey}}" />
24+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPointerOver" Color="{DynamicResource ControlStrokeColorSecondary}" />
25+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPressed" Color="{DynamicResource ControlStrokeColorDefault}" />
26+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushDisabled" Color="{DynamicResource ControlStrokeColorDefault}" />
27+
</ResourceDictionary>
28+
<ResourceDictionary x:Key="Dark" ui:ThemeDictionary.Key="Dark">
29+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrush" Color="{DynamicResource ControlStrokeColorDefault}" />
30+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPointerOver" Color="{DynamicResource ControlStrokeColorSecondary}" />
31+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPressed" Color="{DynamicResource ControlStrokeColorDefault}" />
32+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushDisabled" Color="{DynamicResource ControlStrokeColorDefault}" />
33+
</ResourceDictionary>
34+
<ResourceDictionary x:Key="HighContrast" ui:ThemeDictionary.Key="HighContrast">
35+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrush" Color="{DynamicResource SystemColorButtonTextColor}" />
36+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPointerOver" Color="{DynamicResource SystemColorButtonTextColor}" />
37+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPressed" Color="{DynamicResource SystemColorButtonTextColor}" />
38+
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushDisabled" Color="{DynamicResource SystemColorButtonTextColor}" />
39+
</ResourceDictionary>
40+
</ui:ThemeResources.ThemeDictionaries>
41+
</ui:ThemeResources>
42+
</ResourceDictionary.MergedDictionaries>
43+
</ResourceDictionary>
44+
</FrameworkElement.Resources>
45+
1946
<ui:HyperlinkButton
2047
HorizontalAlignment="Stretch"
2148
VerticalAlignment="Stretch"
2249
HorizontalContentAlignment="Stretch"
2350
VerticalContentAlignment="Stretch"
2451
NavigateUri="{Binding Link, Mode=OneWay}">
2552
<Grid>
26-
<Grid.Resources>
27-
<ResourceDictionary>
28-
<ResourceDictionary.MergedDictionaries>
29-
<ui:ThemeResources CanBeAccessedAcrossThreads="{x:Static local:App.IsMultiThreaded}">
30-
<ui:ThemeResources.ThemeDictionaries>
31-
<ResourceDictionary x:Key="Light" ui:ThemeDictionary.Key="Light">
32-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrush" Color="{DynamicResource ControlStrokeColorDefault}" />
33-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPointerOver" Color="{DynamicResource ControlStrokeColorSecondary}" />
34-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPressed" Color="{DynamicResource ControlStrokeColorDefault}" />
35-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushDisabled" Color="{DynamicResource ControlStrokeColorDefault}" />
36-
</ResourceDictionary>
37-
<ResourceDictionary x:Key="Dark" ui:ThemeDictionary.Key="Dark">
38-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrush" Color="{DynamicResource ControlStrokeColorDefault}" />
39-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPointerOver" Color="{DynamicResource ControlStrokeColorSecondary}" />
40-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPressed" Color="{DynamicResource ControlStrokeColorDefault}" />
41-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushDisabled" Color="{DynamicResource ControlStrokeColorDefault}" />
42-
</ResourceDictionary>
43-
<ResourceDictionary x:Key="HighContrast" ui:ThemeDictionary.Key="HighContrast">
44-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrush" Color="{DynamicResource SystemColorButtonTextColor}" />
45-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPointerOver" Color="{DynamicResource SystemColorButtonTextColor}" />
46-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushPressed" Color="{DynamicResource SystemColorButtonTextColor}" />
47-
<SolidColorBrush x:Key="HyperlinkButtonBorderBrushDisabled" Color="{DynamicResource SystemColorButtonTextColor}" />
48-
</ResourceDictionary>
49-
</ui:ThemeResources.ThemeDictionaries>
50-
</ui:ThemeResources>
51-
</ResourceDictionary.MergedDictionaries>
52-
</ResourceDictionary>
53-
</Grid.Resources>
5453
<Grid.RowDefinitions>
5554
<RowDefinition Height="75" />
5655
<RowDefinition Height="*" />

‎source/iNKORE.UI.WPF.Modern.Gallery/Controls/TileGallery.xaml‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,29 +48,37 @@
4848
</Setter.Value>
4949
</Setter>
5050
</Style>
51+
52+
53+
5154
</ResourceDictionary>
5255
</UserControl.Resources>
5356

5457
<!-- Layout -->
55-
<Grid>
56-
<ScrollViewer
57-
x:Name="scroller"
58+
<Grid RenderOptions.BitmapScalingMode="HighQuality">
59+
<ScrollViewer x:Name="scroller"
5860
HorizontalScrollBarVisibility="Hidden"
5961
VerticalScrollBarVisibility="Disabled">
6062
<Grid Margin="36,0,36,0">
6163
<StackPanel Orientation="Horizontal" Margin="0" HorizontalAlignment="Left" VerticalAlignment="Center">
6264
<local:HeaderTile
6365
Title="Getting started"
6466
Description="Get started with iUWM and explore detailed documentation."
65-
Link="https://docs.inkore.net/ui-wpf-modern/onboarding"
66-
Source="pack://application:,,,/Assets/HomeHeaderTiles/Header-iUWM.png"/>
67+
Link="https://docs.inkore.net/ui-wpf-modern/onboarding">
68+
<local:HeaderTile.Icon>
69+
<Image Width="55" Source="/iNKORE.UI.WPF.Modern.Gallery;component/Assets/WpfLibrary_256w.png"/>
70+
</local:HeaderTile.Icon>
71+
</local:HeaderTile>
6772
<local:HeaderTile
68-
Title="Design"
73+
Title="Design" RenderOptions.BitmapScalingMode="Linear"
6974
Description="Guidelines and toolkits for creating stunning WinUI experiences."
70-
Link="https://learn.microsoft.com/windows/apps/design/"
71-
Source="/Assets/HomeHeaderTiles/Header-WindowsDesign.png"/>
75+
Link="https://learn.microsoft.com/windows/apps/design/">
76+
<local:HeaderTile.Icon>
77+
<Image Width="55" Source="/iNKORE.UI.WPF.Modern.Gallery;component/Assets/HomeHeaderTiles/Header-WindowsDesign.png"/>
78+
</local:HeaderTile.Icon>
79+
</local:HeaderTile>
7280
<local:HeaderTile
73-
Title="iUWM on GitHub"
81+
Title="Source code"
7482
Description="Explore the iUWM source code and repository."
7583
Link="https://github.com/iNKORE-NET/UI.WPF.Modern">
7684
<local:HeaderTile.Icon>

‎source/iNKORE.UI.WPF.Modern/ThemeManager.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ public class ThemeManager : DependencyObject
2525

2626
public const string Link_GithubRepo = "https://github.com/iNKORE-NET/UI.WPF.Modern";
2727
public const string Link_NugetPackage = "https://www.nuget.org/packages/iNKORE.UI.WPF.Modern";
28-
public const string Link_DiscordServer = "https://discord.gg/m6NPNVk4bs";
29-
public const string Link_TelegramGroup = "http://t.me/iNKORE";
30-
public const string Link_FacebookPage = "https://facebook.com/iNKORE.NET";
28+
29+
public const string Link_DiscordServer = "https://www.inkore.net/invito/discord";
30+
public const string Link_TelegramGroup = "https://www.inkore.net/invito/telegram-en";
31+
public const string Link_FacebookPage = "https://www.inkore.net/social/facebook";
3132

3233
public static readonly Uri BannerUri_1280w = new Uri("/iNKORE.UI.WPF.Modern;component/Resources/Images/UI.WPF.Modern_Main_1280w.png", UriKind.Relative);
3334

0 commit comments

Comments
 (0)