diff options
| author | Emmanuel Hansen <emmausssss@gmail.com> | 2022-07-11 22:44:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-12 00:44:35 +0200 |
| commit | 2fa6413ed80931d63dee582943dce8a6d8f86974 (patch) | |
| tree | 2cf1b7eaf15c9650d94460da49096db4189129b7 | |
| parent | 4523a73f75528d57bc7bc6d78024a6737a012a86 (diff) | |
Avalonia - Add border to Flyouts (#3341)1.1.176
* add borders to menus
* apply to dropdowns
* darken the border for dark theme
* fix duplicate keys
| -rw-r--r-- | Ryujinx.Ava/Assets/Styles/BaseDark.xaml | 1 | ||||
| -rw-r--r-- | Ryujinx.Ava/Assets/Styles/BaseLight.xaml | 1 | ||||
| -rw-r--r-- | Ryujinx.Ava/Assets/Styles/Styles.xaml | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Ryujinx.Ava/Assets/Styles/BaseDark.xaml b/Ryujinx.Ava/Assets/Styles/BaseDark.xaml index e32c3d08..074b1661 100644 --- a/Ryujinx.Ava/Assets/Styles/BaseDark.xaml +++ b/Ryujinx.Ava/Assets/Styles/BaseDark.xaml @@ -54,5 +54,6 @@ <Color x:Key="TextOnAccentFillColorPrimary">#FFFFFFFF</Color> <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color> <Color x:Key="ThemeForegroundColor">#FFFFFFFF</Color> + <Color x:Key="MenuFlyoutPresenterBorderColor">#3D3D3D</Color> </Styles.Resources> </Styles>
\ No newline at end of file diff --git a/Ryujinx.Ava/Assets/Styles/BaseLight.xaml b/Ryujinx.Ava/Assets/Styles/BaseLight.xaml index 1d1e4fae..45012c5b 100644 --- a/Ryujinx.Ava/Assets/Styles/BaseLight.xaml +++ b/Ryujinx.Ava/Assets/Styles/BaseLight.xaml @@ -49,5 +49,6 @@ <Color x:Key="TextOnAccentFillColorPrimary">#FFFFFFFF</Color> <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color> <Color x:Key="ThemeForegroundColor">#FF000000</Color> + <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color> </Styles.Resources> </Styles>
\ No newline at end of file diff --git a/Ryujinx.Ava/Assets/Styles/Styles.xaml b/Ryujinx.Ava/Assets/Styles/Styles.xaml index 95eeb378..c93640ae 100644 --- a/Ryujinx.Ava/Assets/Styles/Styles.xaml +++ b/Ryujinx.Ava/Assets/Styles/Styles.xaml @@ -221,6 +221,7 @@ <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" /> </Style> <Styles.Resources> + <SolidColorBrush x:Key="ThemeAccentColorBrush" Color="{DynamicResource SystemAccentColor}" /> <StaticResource x:Key="ListViewItemBackgroundSelected" ResourceKey="ThemeAccentColorBrush" /> <StaticResource x:Key="ListViewItemBackgroundPressed" ResourceKey="SystemAccentColorDark1" /> <StaticResource x:Key="ListViewItemBackgroundPointerOver" ResourceKey="SystemAccentColorDark2" /> @@ -232,7 +233,7 @@ Color="{DynamicResource SystemBaseMediumLowColor}" /> <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush" Color="{DynamicResource DataGridSelectionColor}" /> <SolidColorBrush x:Key="MenuFlyoutPresenterBorderBrush" Color="{DynamicResource MenuFlyoutPresenterBorderColor}" /> - <SolidColorBrush x:Key="ThemeAccentColorBrush" Color="{DynamicResource SystemAccentColor}" /> + <SolidColorBrush x:Key="FlyoutBorderThemeBrush" Color="{DynamicResource MenuFlyoutPresenterBorderColor}" /> <SolidColorBrush x:Key="ListBoxBackground" Color="{DynamicResource ThemeContentBackgroundColor}" /> <SolidColorBrush x:Key="ThemeForegroundBrush" Color="{DynamicResource ThemeForegroundColor}" /> <SolidColorBrush x:Key="ThemeAccentBrush4" Color="{DynamicResource ThemeAccentColor4}" /> |