diff options
| author | Emmanuel Hansen <emmausssss@gmail.com> | 2022-05-15 11:30:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-15 13:30:15 +0200 |
| commit | deb99d2cae3e80bdf70cb52c6c160094dc7c9292 (patch) | |
| tree | e60f44d1b4bd45bbf36fcfa750fb99787febfdbe /Ryujinx.Ava/Assets/Styles | |
| parent | 9ba73ffbe5f78c0403cf102b95768f388da05122 (diff) | |
Avalonia UI - Part 1 (#3270)
* avalonia part 1
* remove vulkan ui backend
* move ui common files to ui common project
* get name for oading screen from device
* rebase.
* review 1
* review 1.1
* review
* cleanup
* addressed review
* use cancellation token
* review
* review
* rebased
* cancel library loading when closing window
* remove star image, use fonticon instead
* delete render control frame buffer when game ends. change position of fav star
* addressed @Thog review
* ensure the right ui is downloaded in updates
* fix crash when showing not supported dialog during controller request
* add prefix to artifact names
* Auto-format Avalonia project
* Fix input
* Fix build, simplify app disposal
* remove nv stutter thread
* addressed review
* add missing change
* maintain window size if new size is zero length
* add game, handheld, docked to local
* reverse scale main window
* Update de_DE.json
* Update de_DE.json
* Update de_DE.json
* Update italian json
* Update it_IT.json
* let render timer poll with no wait
* remove unused code
* more unused code
* enabled tiered compilation and trimming
* check if window event is not closed before signaling
* fix atmospher case
* locale fix
* locale fix
* remove explicit tiered compilation declarations
* Remove ) it_IT.json
* Remove ) de_DE.json
* Update it_IT.json
* Update pt_BR locale with latest strings
* Remove ')'
* add more strings to locale
* update locale
* remove extra slash
* remove extra slash
* set firmware version to 0 if key's not found
* fix
* revert timer changes
* lock on object instead
* Update it_IT.json
* remove unused method
* add load screen text to locale
* drop swap event
* Update de_DE.json
* Update de_DE.json
* do null check when stopping emulator
* Update de_DE.json
* Create tr_TR.json
* Add tr_TR
* Add tr_TR + Turkish
* Update it_IT.json
* Update Ryujinx.Ava/Input/AvaloniaMappingHelper.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Apply suggestions from code review
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Apply suggestions from code review
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* addressed review
* Update Ryujinx.Ava/Ui/Backend/OpenGl/OpenGlRenderTarget.cs
Co-authored-by: gdkchan <gab.dark.100@gmail.com>
* use avalonia's inbuilt renderer on linux
* removed whitespace
* workaround for queue render crash with vsync off
* drop custom backend
* format files
* fix not closing issue
* remove warnings
* rebase
* update avalonia library
* Reposition the Text and Button on About Page
* Assign build version
* Remove appveyor text
Co-authored-by: gdk <gab.dark.100@gmail.com>
Co-authored-by: Niwu34 <67392333+Niwu34@users.noreply.github.com>
Co-authored-by: Antonio Brugnolo <36473846+AntoSkate@users.noreply.github.com>
Co-authored-by: aegiff <99728970+aegiff@users.noreply.github.com>
Co-authored-by: Ac_K <Acoustik666@gmail.com>
Co-authored-by: MostlyWhat <78652091+MostlyWhat@users.noreply.github.com>
Diffstat (limited to 'Ryujinx.Ava/Assets/Styles')
| -rw-r--r-- | Ryujinx.Ava/Assets/Styles/BaseDark.xaml | 56 | ||||
| -rw-r--r-- | Ryujinx.Ava/Assets/Styles/BaseLight.xaml | 51 | ||||
| -rw-r--r-- | Ryujinx.Ava/Assets/Styles/Styles.xaml | 266 |
3 files changed, 373 insertions, 0 deletions
diff --git a/Ryujinx.Ava/Assets/Styles/BaseDark.xaml b/Ryujinx.Ava/Assets/Styles/BaseDark.xaml new file mode 100644 index 00000000..b80cb11f --- /dev/null +++ b/Ryujinx.Ava/Assets/Styles/BaseDark.xaml @@ -0,0 +1,56 @@ +<Styles + xmlns="https://github.com/avaloniaui" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + <StyleInclude Source="avares://Ryujinx.Ava/Assets/Styles/Styles.xaml" /> + <Design.PreviewWith> + <Border Padding="20" Height="2000"> + <StackPanel Spacing="5"> + <TextBlock Text="Code Font Family" /> + <Grid RowDefinitions="*,Auto"> + <Menu Grid.Row="1" Width="100"> + <MenuItem Header="File"> + <MenuItem Header="Test 1" /> + <MenuItem Header="Test 2" /> + <MenuItem Header="Test 3"> + <MenuItem.Icon> + <CheckBox Margin="0" IsChecked="{Binding Checkbox, Mode=TwoWay}" /> + </MenuItem.Icon> + </MenuItem> + </MenuItem> + </Menu> + <StackPanel Orientation="Horizontal"> + <Button + Name="btnAdd" + HorizontalAlignment="Right" + Content="Add" /> + <Button + Name="btnRem" + HorizontalAlignment="Right" + Content="Add" /> + <TextBox Width="100" VerticalAlignment="Center" Text="Rrrrr" Watermark="Hello" + UseFloatingWatermark="True" /> + <CheckBox>Test Check</CheckBox> + </StackPanel> + </Grid> + </StackPanel> + </Border> + </Design.PreviewWith> + <Styles.Resources> + <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush" Color="{DynamicResource DataGridSelectionColor}" /> + <SolidColorBrush x:Key="ThemeAccentColorBrush" Color="{DynamicResource SystemAccentColor}" /> + <SolidColorBrush x:Key="ThemeAccentBrush4" Color="{DynamicResource ThemeAccentColor4}" /> + <Color x:Key="SystemAccentColor">#FF00C3E3</Color> + <Color x:Key="SystemAccentColorDark1">#FF99b000</Color> + <Color x:Key="SystemAccentColorDark2">#FF006d7d</Color> + <Color x:Key="SystemAccentColorDark3">#FF00525E</Color> + <Color x:Key="SystemAccentColorLight1">#FF00dbff</Color> + <Color x:Key="SystemAccentColorLight2">#FF19dfff</Color> + <Color x:Key="SystemAccentColorLight3">#FF33e3ff</Color> + <Color x:Key="DataGridSelectionColor">#FF00FABB</Color> + <Color x:Key="ThemeContentBackgroundColor">#FF2D2D2D</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> + </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 new file mode 100644 index 00000000..c2739895 --- /dev/null +++ b/Ryujinx.Ava/Assets/Styles/BaseLight.xaml @@ -0,0 +1,51 @@ +<Styles + xmlns="https://github.com/avaloniaui" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + <StyleInclude Source="avares://Ryujinx.Ava/Assets/Styles/Styles.xaml" /> + <Design.PreviewWith> + <Border Padding="20" Height="2000"> + <StackPanel Spacing="5"> + <TextBlock Text="Code Font Family" /> + <Grid RowDefinitions="*,Auto"> + <Menu Grid.Row="1" Width="100"> + <MenuItem Header="File"> + <MenuItem Header="Test 1" /> + <MenuItem Header="Test 2" /> + <MenuItem Header="Test 3"> + <MenuItem.Icon> + <CheckBox Margin="0" IsChecked="{Binding Checkbox, Mode=TwoWay}" /> + </MenuItem.Icon> + </MenuItem> + </MenuItem> + </Menu> + <StackPanel Orientation="Horizontal"> + <Button + Name="btnAdd" + HorizontalAlignment="Right" + Content="Add" /> + <Button + Name="btnRem" + HorizontalAlignment="Right" + Content="Add" /> + <TextBox Width="100" VerticalAlignment="Center" Text="Rrrrr" Watermark="Hello" + UseFloatingWatermark="True" /> + <CheckBox>Test Check</CheckBox> + </StackPanel> + </Grid> + </StackPanel> + </Border> + </Design.PreviewWith> + <Styles.Resources> + <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush" Color="{DynamicResource DataGridSelectionColor}" /> + <SolidColorBrush x:Key="ThemeAccentColorBrush" Color="{DynamicResource SystemAccentColor}" /> + <SolidColorBrush x:Key="ThemeAccentBrush4" Color="{DynamicResource ThemeAccentColor4}" /> + <Color x:Key="SystemAccentColor">#FF00C3E3</Color> + <Color x:Key="ThemeAccentColor4">#FFe8e8e8</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="ThemeForegroundColor">#FF000000</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 new file mode 100644 index 00000000..422e6fa4 --- /dev/null +++ b/Ryujinx.Ava/Assets/Styles/Styles.xaml @@ -0,0 +1,266 @@ +<Styles + xmlns="https://github.com/avaloniaui" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" + xmlns:sys="clr-namespace:System;assembly=netstandard"> + <Design.PreviewWith> + <Border Padding="20" Height="2000"> + <StackPanel Spacing="5"> + <TextBlock Text="Code Font Family" /> + <Grid RowDefinitions="*,Auto"> + <Menu Grid.Row="1" Width="100"> + <MenuItem Header="File"> + <MenuItem Header="Test 1" /> + <MenuItem Header="Test 2" /> + <MenuItem Header="Test 3"> + <MenuItem.Icon> + <CheckBox Margin="0" IsChecked="{Binding Checkbox, Mode=TwoWay}" /> + </MenuItem.Icon> + </MenuItem> + </MenuItem> + </Menu> + <StackPanel Orientation="Horizontal"> + <ToggleButton + Name="btnAdd" + HorizontalAlignment="Right" + Height="28" + Content="Addy" /> + <Button + Name="btnRem" + HorizontalAlignment="Right" + Content="Add" /> + <TextBox Width="100" VerticalAlignment="Center" Text="Rrrrr" Watermark="Hello" + UseFloatingWatermark="True" /> + <CheckBox>Test Check</CheckBox> + </StackPanel> + </Grid> + <ui:NumberBox Value="1" /> + </StackPanel> + </Border> + </Design.PreviewWith> + <Style Selector="Border.small"> + <Setter Property="Width" Value="100" /> + </Style> + <Style Selector="Border.normal"> + <Setter Property="Width" Value="130" /> + </Style> + <Style Selector="Border.large"> + <Setter Property="Width" Value="160" /> + </Style> + <Style Selector="Border.huge"> + <Setter Property="Width" Value="200" /> + </Style> + <Style Selector="Image.small"> + <Setter Property="Width" Value="50" /> + </Style> + <Style Selector="Image.normal"> + <Setter Property="Width" Value="80" /> + </Style> + <Style Selector="Image.large"> + <Setter Property="Width" Value="100" /> + </Style> + <Style Selector="Image.huge"> + <Setter Property="Width" Value="120" /> + </Style> + <Style Selector="RadioButton"> + <Setter Property="VerticalContentAlignment" Value="Center" /> + </Style> + <Style Selector="#TitleBarHost > Image"> + <Setter Property="Margin" Value="10" /> + </Style> + <Style Selector="#TitleBarHost > Label"> + <Setter Property="Margin" Value="5" /> + <Setter Property="FontSize" Value="14" /> + </Style> + <Style Selector="Button.SystemCaption"> + <Setter Property="MinWidth" Value="10" /> + </Style> + <Style Selector="DataGridColumnHeader"> + <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" /> + <Setter Property="HorizontalContentAlignment" Value="Center" /> + <Setter Property="BorderThickness" Value="1" /> + <Setter Property="VerticalContentAlignment" Value="Center" /> + <Setter Property="Background" Value="{DynamicResource ThemeControlBorderColor}" /> + <Setter Property="SeparatorBrush" Value="{DynamicResource ThemeControlBorderColor}" /> + <Setter Property="Padding" Value="5" /> + <Setter Property="Background" Value="{DynamicResource ThemeContentBackgroundColor}" /> + <Setter Property="Template"> + <ControlTemplate> + <Grid Background="{TemplateBinding Background}" ColumnDefinitions="*,Auto"> + <Grid + Margin="{TemplateBinding Padding}" + HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" + VerticalAlignment="{TemplateBinding VerticalContentAlignment}" + ColumnDefinitions="*,Auto"> + <ContentPresenter Content="{TemplateBinding Content}" /> + <Path + Name="SortIcon" + Grid.Column="1" + Width="8" + Margin="4,0,0,0" + HorizontalAlignment="Left" + VerticalAlignment="Center" + Data="F1 M -5.215,6.099L 5.215,6.099L 0,0L -5.215,6.099 Z " + Fill="{TemplateBinding Foreground}" + Stretch="Uniform" /> + </Grid> + <Rectangle + Name="VerticalSeparator" + Grid.Column="1" + Width="1" + VerticalAlignment="Stretch" + Fill="{TemplateBinding SeparatorBrush}" + IsVisible="{TemplateBinding AreSeparatorsVisible}" /> + </Grid> + </ControlTemplate> + </Setter> + </Style> + <Style Selector="DataGrid"> + <Setter Property="RowBackground" Value="{DynamicResource ThemeAccentBrush4}" /> + <Setter Property="AlternatingRowBackground" Value="#00FFFFFF" /> + <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" /> + <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowColor}" /> + <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" /> + </Style> + <Style Selector="DataGridRow:selected:focus /template/ Rectangle#BackgroundRectangle"> + <Setter Property="Fill" Value="{DynamicResource SystemAccentColor}" /> + <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" /> + </Style> + <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle"> + <Setter Property="Fill" Value="{DynamicResource SystemListLowColor}" /> + </Style> + <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle"> + <Setter Property="Fill" Value="{DynamicResource SystemAccentColor}" /> + <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" /> + </Style> + <Style Selector="DataGridRow:selected:pointerover /template/ Rectangle#BackgroundRectangle"> + <Setter Property="Fill" Value="{DynamicResource SystemAccentColor}" /> + <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" /> + </Style> + <Style Selector="DataGridRow:selected:pointerover:focus /template/ Rectangle#BackgroundRectangle"> + <Setter Property="Fill" Value="{DynamicResource SystemAccentColor}" /> + <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" /> + </Style> + <Style Selector="DataGridCell"> + <Setter Property="HorizontalAlignment" Value="Center" /> + <Setter Property="HorizontalContentAlignment" Value="Center" /> + </Style> + <Style Selector="DataGridCell.Left"> + <Setter Property="HorizontalAlignment" Value="Left" /> + </Style> + <Style Selector="CheckBox"> + <Setter Property="BorderThickness" Value="1" /> + </Style> + + <Style Selector="MenuItem"> + <Setter Property="Height" Value="{DynamicResource MenuItemHeight}" /> + <Setter Property="Padding" Value="{DynamicResource MenuItemPadding}" /> + </Style> + <Style Selector="MenuItem:selected /template/ Border#root"> + <Setter Property="Background" Value="{DynamicResource ThemeControlBorderColor}" /> + <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlBorderColor}" /> + </Style> + <Style Selector="TabItem > ScrollViewer"> + <Setter Property="Background" Value="{DynamicResource ThemeBackgroundColor}" /> + <Setter Property="Margin" Value="0,-5,0,0" /> + </Style> + <Style Selector="TabItem > ScrollViewer > Border"> + <Setter Property="BorderThickness" Value="0,1,0,0" /> + <Setter Property="Background" Value="{DynamicResource ThemeBackgroundColor}" /> + <Setter Property="BorderBrush" Value="{DynamicResource HighlightBrush}" /> + </Style> + <Style Selector="Button"> + <Setter Property="MinWidth" Value="80" /> + </Style> + <Style Selector="ToggleButton"> + <Setter Property="Padding" Value="0,-5,0,0" /> + </Style> + <Style Selector="TabItem"> + <Setter Property="FontSize" Value="14" /> + <Setter Property="BorderThickness" Value="0,0,1,0" /> + <Setter Property="BorderBrush" Value="{DynamicResource ThemeButtonForegroundColor}" /> + <Setter Property="Background" Value="{DynamicResource HighlightColor}" /> + </Style> + <Style Selector="TabItem:pointerover"> + <Setter Property="Foreground" Value="{DynamicResource ThemeButtonForegroundColor}" /> + </Style> + <Style Selector="TabItem:selected"> + <Setter Property="Background" Value="{DynamicResource HighlightColor}" /> + <Setter Property="Foreground" Value="{DynamicResource ThemeBackgroundColor}" /> + </Style> + <Style Selector="TextBlock"> + <Setter Property="Margin" Value="{DynamicResource TextMargin}" /> + <Setter Property="FontSize" Value="{DynamicResource FontSize}" /> + <Setter Property="VerticalAlignment" Value="Center" /> + </Style> + <Style Selector="Separator"> + <Setter Property="Background" Value="{DynamicResource ThemeControlBorderColor}" /> + <Setter Property="Foreground" Value="{DynamicResource ThemeControlBorderColor}" /> + <Setter Property="MinHeight" Value="1" /> + </Style> + <Style Selector=":is(Button).DateTimeFlyoutButtonStyle"> + <Setter Property="Background" Value="{DynamicResource HighlightColor}" /> + <Setter Property="Foreground" Value="{DynamicResource ThemeBackgroundColor}" /> + </Style> + <Style Selector="DatePickerPresenter"> + <Setter Property="BorderThickness" Value="1" /> + <Setter Property="BorderBrush" Value="{DynamicResource ThemeButtonForegroundColor}" /> + </Style> + <Style Selector="DataGridCell"> + <Setter Property="FontSize" Value="14" /> + </Style> + <Style Selector="CheckBox TextBlock"> + <Setter Property="Margin" Value="0,5,0,0" /> + </Style> + <Style Selector="ContextMenu"> + <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" /> + <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" /> + </Style> + <Style Selector="TextBox.NumberBoxTextBoxStyle"> + <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" /> + </Style> + <Styles.Resources> + <StaticResource x:Key="ListViewItemBackgroundSelected" ResourceKey="ThemeAccentColorBrush" /> + <StaticResource x:Key="ListViewItemBackgroundPressed" ResourceKey="SystemAccentColorDark1" /> + <StaticResource x:Key="ListViewItemBackgroundPointerOver" ResourceKey="SystemAccentColorDark2" /> + <StaticResource x:Key="ListViewItemBackgroundSelectedPressed" ResourceKey="ThemeAccentColorBrush" /> + <StaticResource x:Key="ListViewItemBackgroundSelectedPointerOver" ResourceKey="SystemAccentColorDark2" /> + <SolidColorBrush x:Key="DataGridGridLinesBrush" + Color="{DynamicResource SystemBaseMediumLowColor}" + Opacity="0.4" /> + <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush" Color="{DynamicResource DataGridSelectionColor}" /> + <SolidColorBrush x:Key="MenuFlyoutPresenterBorderBrush" + Color="{DynamicResource MenuFlyoutPresenterBorderColor}" /> + <SolidColorBrush x:Key="ThemeAccentColorBrush" Color="{DynamicResource SystemAccentColor}" /> + <SolidColorBrush x:Key="ListBoxBackground" Color="{DynamicResource ThemeContentBackgroundColor}" /> + <SolidColorBrush x:Key="ThemeForegroundBrush" Color="{DynamicResource ThemeForegroundColor}" /> + <SolidColorBrush x:Key="ThemeAccentBrush4" Color="{DynamicResource ThemeAccentColor4}" /> + <SolidColorBrush x:Key="SplitButtonBackgroundChecked" Color="#00E81123" /> + <SolidColorBrush x:Key="SplitButtonBackgroundCheckedPointerOver" Color="#00E81123" /> + <SolidColorBrush x:Key="SplitButtonBackgroundCheckedPressed" Color="#00E81123" /> + <SolidColorBrush x:Key="SplitButtonBackgroundCheckedDisabled" Color="#00E81123" /> + <Thickness x:Key="PageMargin">40 0 40 0</Thickness> + <Thickness x:Key="Margin">0 5 0 5</Thickness> + <Thickness x:Key="TextMargin">0 4 0 0</Thickness> + <Thickness x:Key="MenuItemPadding">5 0 5 0</Thickness> + <Color x:Key="MenuFlyoutPresenterBorderColor">#00000000</Color> + <Color x:Key="SystemAccentColor">#FF00C3E3</Color> + <Color x:Key="SystemAccentColorDark1">#FF00C3E3</Color> + <Color x:Key="SystemAccentColorDark2">#FF00C3E3</Color> + <Color x:Key="SystemAccentColorDark3">#FF00C3E3</Color> + <Color x:Key="SystemAccentColorLight1">#FF00C3E3</Color> + <Color x:Key="SystemAccentColorLight2">#FF00C3E3</Color> + <Color x:Key="SystemAccentColorLight3">#FF00C3E3</Color> + <Color x:Key="DataGridSelectionColor">#FF00FABB</Color> + <Color x:Key="ThemeContentBackgroundColor">#FF2D2D2D</Color> + <Color x:Key="ThemeControlBorderColor">#FF505050</Color> + <sys:Double x:Key="ScrollBarThickness">15</sys:Double> + <sys:Double x:Key="FontSizeSmall">8</sys:Double> + <sys:Double x:Key="FontSizeNormal">10</sys:Double> + <sys:Double x:Key="FontSize">12</sys:Double> + <sys:Double x:Key="FontSizeLarge">15</sys:Double> + <sys:Double x:Key="ControlContentThemeFontSize">13</sys:Double> + <x:Double x:Key="MenuItemHeight">26</x:Double> + <x:Double x:Key="TabItemMinHeight">28</x:Double> + </Styles.Resources> +</Styles>
\ No newline at end of file |
