Просмотр исходного кода

UI: Fixed some light theme colors (#420)

Closes #419
GabCoolGuy 1 год назад
Родитель
Сommit
a460eda195
1 измененных файлов с 12 добавлено и 8 удалено
  1. 12 8
      src/Ryujinx/Assets/Styles/Themes.xaml

+ 12 - 8
src/Ryujinx/Assets/Styles/Themes.xaml

@@ -4,11 +4,10 @@
         <ResourceDictionary x:Key="Default">
         <ResourceDictionary x:Key="Default">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
                              Color="{DynamicResource DataGridSelectionColor}" />
                              Color="{DynamicResource DataGridSelectionColor}" />
+            <Color x:Key="ControlFillColorSecondary">#008AA8</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FFF0F0F0</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FFF0F0F0</Color>
             <Color x:Key="ThemeControlBorderColor">#FFd6d6d6</Color>
             <Color x:Key="ThemeControlBorderColor">#FFd6d6d6</Color>
-            <Color x:Key="TextOnAccentFillColorPrimary">#FFFFFFFF</Color>
-            <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
             <Color x:Key="ThemeForegroundColor">#FF000000</Color>
             <Color x:Key="ThemeForegroundColor">#FF000000</Color>
             <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
             <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
             <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
             <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
@@ -22,16 +21,19 @@
         <ResourceDictionary x:Key="Light">
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
                              Color="{DynamicResource DataGridSelectionColor}" />
                              Color="{DynamicResource DataGridSelectionColor}" />
+            <Color x:Key="ControlFillColorSecondary">#3ddcff</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
-            <Color x:Key="ThemeContentBackgroundColor">#FFF0F0F0</Color>
-            <Color x:Key="ThemeControlBorderColor">#FFd6d6d6</Color>
-            <Color x:Key="TextOnAccentFillColorPrimary">#FFFFFFFF</Color>
-            <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
+            <Color x:Key="ThemeContentBackgroundColor">#dedede</Color>
+            <Color x:Key="ThemeControlBorderColor">#c2c2c2</Color>
             <Color x:Key="ThemeForegroundColor">#FF000000</Color>
             <Color x:Key="ThemeForegroundColor">#FF000000</Color>
             <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
             <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
             <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
             <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
             <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
             <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
             <Color x:Key="SecondaryTextColor">#A0000000</Color>
             <Color x:Key="SecondaryTextColor">#A0000000</Color>
+            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
+            <Color x:Key="Switch">#13c3a4</Color>
+            <Color x:Key="Unbounded">#FFFF4554</Color>
+            <Color x:Key="Custom">#6483F5</Color>
         </ResourceDictionary>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
         <ResourceDictionary x:Key="Dark">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -40,13 +42,15 @@
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FF2D2D2D</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FF2D2D2D</Color>
             <Color x:Key="ThemeControlBorderColor">#FF505050</Color>
             <Color x:Key="ThemeControlBorderColor">#FF505050</Color>
-            <Color x:Key="TextOnAccentFillColorPrimary">#FFFFFFFF</Color>
-            <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
             <Color x:Key="ThemeForegroundColor">#FFFFFFFF</Color>
             <Color x:Key="ThemeForegroundColor">#FFFFFFFF</Color>
             <Color x:Key="MenuFlyoutPresenterBorderColor">#3D3D3D</Color>
             <Color x:Key="MenuFlyoutPresenterBorderColor">#3D3D3D</Color>
             <Color x:Key="AppListBackgroundColor">#0FFFFFFF</Color>
             <Color x:Key="AppListBackgroundColor">#0FFFFFFF</Color>
             <Color x:Key="AppListHoverBackgroundColor">#1EFFFFFF</Color>
             <Color x:Key="AppListHoverBackgroundColor">#1EFFFFFF</Color>
             <Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
             <Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
+            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
+            <Color x:Key="Switch">#FF2EEAC9</Color>
+            <Color x:Key="Unbounded">#FFFF4554</Color>
+            <Color x:Key="Custom">#6483F5</Color>
         </ResourceDictionary>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
 </ResourceDictionary>