aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Ava/Assets
diff options
context:
space:
mode:
authorMutantAura <44103205+MutantAura@users.noreply.github.com>2022-09-19 20:04:22 +0100
committerGitHub <noreply@github.com>2022-09-19 16:04:22 -0300
commit41790aa7434a5e6d132fad2e24844d450378205b (patch)
tree7d8dfbdf37b63a939038dad5db2153477da83d26 /Ryujinx.Ava/Assets
parent0cb1e926b594432134f5d35d02da622cd3fd3458 (diff)
Avalonia - Misc changes to UX (#3643)
* Change navbar from compact to default and force text overflow globally * Fix settings window * Fix right stick control alignment * Initialize value and add logging for SDL IDs * Fix alignment of setting text and improve borders * Clean up padding and size of buttons on controller settings * Fix right side trigger alignment and correct styling * Revert axaml alignment * Fix alignment of volume widget * Fix timezone autocompletebox dropdown height * MainWindow: Line up volume status bar item * Remove margins and add padding to volume widget * Make volume text localizable. Co-authored-by: merry <git@mary.rs>
Diffstat (limited to 'Ryujinx.Ava/Assets')
-rw-r--r--Ryujinx.Ava/Assets/Locales/en_US.json3
-rw-r--r--Ryujinx.Ava/Assets/Styles/Styles.xaml14
2 files changed, 16 insertions, 1 deletions
diff --git a/Ryujinx.Ava/Assets/Locales/en_US.json b/Ryujinx.Ava/Assets/Locales/en_US.json
index 350e2063..a6641a02 100644
--- a/Ryujinx.Ava/Assets/Locales/en_US.json
+++ b/Ryujinx.Ava/Assets/Locales/en_US.json
@@ -588,5 +588,6 @@
"SettingsTabGraphicsPreferredGpuTooltip": "Select the graphics card that will be used with the Vulkan graphics backend.\n\nDoes not affect the GPU that OpenGL will use.\n\nSet to the GPU flagged as \"dGPU\" if unsure. If there isn't one, leave untouched.",
"SettingsAppRequiredRestartMessage": "Ryujinx Restart Required",
"SettingsGpuBackendRestartMessage": "Graphics Backend or Gpu settings have been modified. This will require a restart to be applied",
- "SettingsGpuBackendRestartSubMessage": "Do you want to restart now?"
+ "SettingsGpuBackendRestartSubMessage": "Do you want to restart now?",
+ "VolumeShort": "Vol"
}
diff --git a/Ryujinx.Ava/Assets/Styles/Styles.xaml b/Ryujinx.Ava/Assets/Styles/Styles.xaml
index c93640ae..8b09bafd 100644
--- a/Ryujinx.Ava/Assets/Styles/Styles.xaml
+++ b/Ryujinx.Ava/Assets/Styles/Styles.xaml
@@ -54,6 +54,12 @@
<Style Selector="Border.huge">
<Setter Property="Width" Value="200" />
</Style>
+ <Style Selector="Border.settings">
+ <Setter Property="Background" Value="{DynamicResource ThemeDarkColor}" />
+ <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderColor}" />
+ <Setter Property="BorderThickness" Value="2" />
+ <Setter Property="CornerRadius" Value="3" />
+ </Style>
<Style Selector="Image.small">
<Setter Property="Width" Value="50" />
</Style>
@@ -193,6 +199,14 @@
<Setter Property="Margin" Value="{DynamicResource TextMargin}" />
<Setter Property="FontSize" Value="{DynamicResource FontSize}" />
<Setter Property="VerticalAlignment" Value="Center" />
+ <Setter Property="TextWrapping" Value="WrapWithOverflow" />
+ </Style>
+ <Style Selector="TextBlock.h1">
+ <Setter Property="Margin" Value="{DynamicResource TextMargin}" />
+ <Setter Property="VerticalAlignment" Value="Center" />
+ <Setter Property="FontWeight" Value="Bold" />
+ <Setter Property="FontSize" Value="16" />
+ <Setter Property="TextWrapping" Value="WrapWithOverflow" />
</Style>
<Style Selector="Separator">
<Setter Property="Background" Value="{DynamicResource ThemeControlBorderColor}" />