mirror of
https://git.naxdy.org/Mirror/Ryujinx.git
synced 2025-01-07 16:33:05 +00:00
Added icon dictionary
Removed the Chip icon from GlyphValueConverter.cs Replaced all settings window sidebar icons with new ones for consistency Increased sidebar icon size from 16 points to 20 points
This commit is contained in:
parent
ed1e4cd979
commit
269c508d87
5 changed files with 4957 additions and 18 deletions
64
src/Ryujinx/Assets/Fonts/FluentSystemIconsResizable.xaml
Normal file
64
src/Ryujinx/Assets/Fonts/FluentSystemIconsResizable.xaml
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||||
|
xmlns:local="clr-namespace:Ryujinx.Assets.Fonts">
|
||||||
|
|
||||||
|
<FontFamily x:Key="FluentSystemIconsResizable">avares://Ryujinx/Assets/Fonts#FluentSystemIcons-Resizable</FontFamily>
|
||||||
|
|
||||||
|
<!-- The same symbol size FluentAvalonia uses, see https://github.com/amwx/FluentAvalonia/blob/v2.0.4/src/FluentAvalonia/UI/Controls/IconElement/SymbolIcon.cs -->
|
||||||
|
<x:Double x:Key="FontIconSize">20</x:Double>
|
||||||
|
|
||||||
|
<ui:FontIconSource
|
||||||
|
x:Key="New"
|
||||||
|
FontFamily="{StaticResource FluentSystemIconsResizable}"
|
||||||
|
FontSize="{StaticResource FontIconSize}"
|
||||||
|
Glyph="{x:Static local:FluentSystemIconsResizable.New}" />
|
||||||
|
|
||||||
|
<ui:FontIconSource
|
||||||
|
x:Key="Games"
|
||||||
|
FontFamily="{StaticResource FluentSystemIconsResizable}"
|
||||||
|
FontSize="{StaticResource FontIconSize}"
|
||||||
|
Glyph="{x:Static local:FluentSystemIconsResizable.Games}" />
|
||||||
|
|
||||||
|
<ui:FontIconSource
|
||||||
|
x:Key="Keyboard"
|
||||||
|
FontFamily="{StaticResource FluentSystemIconsResizable}"
|
||||||
|
FontSize="{StaticResource FontIconSize}"
|
||||||
|
Glyph="{x:Static local:FluentSystemIconsResizable.Keyboard}" />
|
||||||
|
|
||||||
|
<ui:FontIconSource
|
||||||
|
x:Key="Settings"
|
||||||
|
FontFamily="{StaticResource FluentSystemIconsResizable}"
|
||||||
|
FontSize="{StaticResource FontIconSize}"
|
||||||
|
Glyph="{x:Static local:FluentSystemIconsResizable.Settings}" />
|
||||||
|
|
||||||
|
<ui:FontIconSource
|
||||||
|
x:Key="DeveloperBoard"
|
||||||
|
FontFamily="{StaticResource FluentSystemIconsResizable}"
|
||||||
|
FontSize="{StaticResource FontIconSize}"
|
||||||
|
Glyph="{x:Static local:FluentSystemIconsResizable.DeveloperBoard}" />
|
||||||
|
|
||||||
|
<ui:FontIconSource
|
||||||
|
x:Key="Image"
|
||||||
|
FontFamily="{StaticResource FluentSystemIconsResizable}"
|
||||||
|
FontSize="{StaticResource FontIconSize}"
|
||||||
|
Glyph="{x:Static local:FluentSystemIconsResizable.Image}" />
|
||||||
|
|
||||||
|
<ui:FontIconSource
|
||||||
|
x:Key="MusicNote"
|
||||||
|
FontFamily="{StaticResource FluentSystemIconsResizable}"
|
||||||
|
FontSize="{StaticResource FontIconSize}"
|
||||||
|
Glyph="{x:Static local:FluentSystemIconsResizable.MusicNote2}" />
|
||||||
|
|
||||||
|
<ui:FontIconSource
|
||||||
|
x:Key="Globe"
|
||||||
|
FontFamily="{StaticResource FluentSystemIconsResizable}"
|
||||||
|
FontSize="{StaticResource FontIconSize}"
|
||||||
|
Glyph="{x:Static local:FluentSystemIconsResizable.Globe}" />
|
||||||
|
|
||||||
|
<ui:FontIconSource
|
||||||
|
x:Key="Document"
|
||||||
|
FontFamily="{StaticResource FluentSystemIconsResizable}"
|
||||||
|
FontSize="{StaticResource FontIconSize}"
|
||||||
|
Glyph="{x:Static local:FluentSystemIconsResizable.Document}" />
|
||||||
|
</ResourceDictionary>
|
4867
src/Ryujinx/Assets/Fonts/FluentSystemIconsResizable.xaml.cs
Normal file
4867
src/Ryujinx/Assets/Fonts/FluentSystemIconsResizable.xaml.cs
Normal file
File diff suppressed because it is too large
Load diff
|
@ -103,6 +103,9 @@
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</AvaloniaResource>
|
</AvaloniaResource>
|
||||||
<AvaloniaResource Include="Assets\Fonts\FluentSystemIcons-Resizable.ttf" />
|
<AvaloniaResource Include="Assets\Fonts\FluentSystemIcons-Resizable.ttf" />
|
||||||
|
<AvaloniaResource Include="Assets\Fonts\FluentSystemIconsResizable.xaml">
|
||||||
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
</AvaloniaResource>
|
||||||
<AvaloniaResource Include="Assets\Styles\Themes.xaml">
|
<AvaloniaResource Include="Assets\Styles\Themes.xaml">
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</AvaloniaResource>
|
</AvaloniaResource>
|
||||||
|
|
|
@ -13,7 +13,6 @@ namespace Ryujinx.Ava.UI.Helpers
|
||||||
{
|
{
|
||||||
{ Glyph.List, char.ConvertFromUtf32((int)Symbol.List) },
|
{ Glyph.List, char.ConvertFromUtf32((int)Symbol.List) },
|
||||||
{ Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
|
{ Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
|
||||||
{ Glyph.Chip, char.ConvertFromUtf32(59748) },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public GlyphValueConverter(string key)
|
public GlyphValueConverter(string key)
|
||||||
|
|
|
@ -17,7 +17,18 @@
|
||||||
WindowStartupLocation="CenterOwner"
|
WindowStartupLocation="CenterOwner"
|
||||||
x:DataType="viewModels:SettingsViewModel"
|
x:DataType="viewModels:SettingsViewModel"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Focusable="True">
|
Focusable="True"
|
||||||
|
UseLayoutRounding="True"
|
||||||
|
RenderOptions.TextRenderingMode="Antialias">
|
||||||
|
<window:StyleableWindow.Resources>
|
||||||
|
<ResourceDictionary>
|
||||||
|
<x:Double x:Key="NavigationViewItemOnLeftIconBoxHeight">20</x:Double>
|
||||||
|
|
||||||
|
<ResourceDictionary.MergedDictionaries>
|
||||||
|
<MergeResourceInclude Source="/Assets/Fonts/FluentSystemIconsResizable.xaml"/>
|
||||||
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
</ResourceDictionary>
|
||||||
|
</window:StyleableWindow.Resources>
|
||||||
<Design.DataContext>
|
<Design.DataContext>
|
||||||
<viewModels:SettingsViewModel />
|
<viewModels:SettingsViewModel />
|
||||||
</Design.DataContext>
|
</Design.DataContext>
|
||||||
|
@ -58,44 +69,39 @@
|
||||||
IsSelected="True"
|
IsSelected="True"
|
||||||
Content="{locale:Locale SettingsTabGeneral}"
|
Content="{locale:Locale SettingsTabGeneral}"
|
||||||
Tag="UiPage"
|
Tag="UiPage"
|
||||||
IconSource="New" />
|
IconSource="{StaticResource New}" />
|
||||||
<ui:NavigationViewItem
|
<ui:NavigationViewItem
|
||||||
Content="{locale:Locale SettingsTabInput}"
|
Content="{locale:Locale SettingsTabInput}"
|
||||||
Tag="InputPage"
|
Tag="InputPage"
|
||||||
IconSource="Games" />
|
IconSource="{StaticResource Games}" />
|
||||||
<ui:NavigationViewItem
|
<ui:NavigationViewItem
|
||||||
Content="{locale:Locale SettingsTabHotkeys}"
|
Content="{locale:Locale SettingsTabHotkeys}"
|
||||||
Tag="HotkeysPage"
|
Tag="HotkeysPage"
|
||||||
IconSource="Keyboard" />
|
IconSource="{StaticResource Keyboard}" />
|
||||||
<ui:NavigationViewItem
|
<ui:NavigationViewItem
|
||||||
Content="{locale:Locale SettingsTabSystem}"
|
Content="{locale:Locale SettingsTabSystem}"
|
||||||
Tag="SystemPage"
|
Tag="SystemPage"
|
||||||
IconSource="Settings" />
|
IconSource="{StaticResource Settings}" />
|
||||||
<ui:NavigationViewItem
|
<ui:NavigationViewItem
|
||||||
Content="{locale:Locale SettingsTabCpu}"
|
Content="{locale:Locale SettingsTabCpu}"
|
||||||
Tag="CpuPage">
|
Tag="CpuPage"
|
||||||
<ui:NavigationViewItem.IconSource>
|
IconSource="{StaticResource DeveloperBoard}" />
|
||||||
<ui:FontIconSource
|
|
||||||
FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
|
|
||||||
Glyph="{helpers:GlyphValueConverter Chip}" />
|
|
||||||
</ui:NavigationViewItem.IconSource>
|
|
||||||
</ui:NavigationViewItem>
|
|
||||||
<ui:NavigationViewItem
|
<ui:NavigationViewItem
|
||||||
Content="{locale:Locale SettingsTabGraphics}"
|
Content="{locale:Locale SettingsTabGraphics}"
|
||||||
Tag="GraphicsPage"
|
Tag="GraphicsPage"
|
||||||
IconSource="Image" />
|
IconSource="{StaticResource Image}" />
|
||||||
<ui:NavigationViewItem
|
<ui:NavigationViewItem
|
||||||
Content="{locale:Locale SettingsTabAudio}"
|
Content="{locale:Locale SettingsTabAudio}"
|
||||||
IconSource="Audio"
|
Tag="AudioPage"
|
||||||
Tag="AudioPage" />
|
IconSource="{StaticResource MusicNote}" />
|
||||||
<ui:NavigationViewItem
|
<ui:NavigationViewItem
|
||||||
Content="{locale:Locale SettingsTabNetwork}"
|
Content="{locale:Locale SettingsTabNetwork}"
|
||||||
Tag="NetworkPage"
|
Tag="NetworkPage"
|
||||||
IconSource="Globe" />
|
IconSource="{StaticResource Globe}" />
|
||||||
<ui:NavigationViewItem
|
<ui:NavigationViewItem
|
||||||
Content="{locale:Locale SettingsTabLogging}"
|
Content="{locale:Locale SettingsTabLogging}"
|
||||||
Tag="LoggingPage"
|
Tag="LoggingPage"
|
||||||
IconSource="Document" />
|
IconSource="{StaticResource Document}" />
|
||||||
</ui:NavigationView.MenuItems>
|
</ui:NavigationView.MenuItems>
|
||||||
<ui:NavigationView.Styles>
|
<ui:NavigationView.Styles>
|
||||||
<Style Selector="Grid#PlaceholderGrid">
|
<Style Selector="Grid#PlaceholderGrid">
|
||||||
|
|
Loading…
Reference in a new issue