diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-05-02 03:29:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-02 03:29:47 +0200 |
| commit | dd574146fb5f05c1c0a469a4ad4a20c46bb37d74 (patch) | |
| tree | 581cf26bcc2a5a31da00a66fd3255cfd489faced /src/Ryujinx.Ava/UI/Views | |
| parent | 2c94ac455ead867aac0a7a689a55d814a8bcc0da (diff) | |
Add hide-cursor command line argument & always hide cursor option (#4613)
* Add hide-cursor command line argument
* gtk: Adjust SettingsWindow for hide cursor options
* ava: Adjust SettingsWindow for hide cursor options
* ava: Add override check for HideCursor arg
* Remove copy&paste sins
* ava: Leave a little more room between the options
* gtk: Fix hide cursor issues
* ava: Only hide cursor if it's within the embedded window
Diffstat (limited to 'src/Ryujinx.Ava/UI/Views')
| -rw-r--r-- | src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml index 61b6c433..acc5e2b7 100644 --- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml +++ b/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml @@ -1,4 +1,4 @@ -<UserControl +<UserControl x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsUIView" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" @@ -12,7 +12,7 @@ <Design.DataContext> <viewModels:SettingsViewModel /> </Design.DataContext> - <ScrollViewer + <ScrollViewer Name="UiPage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" @@ -37,9 +37,24 @@ <CheckBox IsChecked="{Binding ShowConfirmExit}"> <TextBlock Text="{locale:Locale SettingsTabGeneralShowConfirmExitDialog}" /> </CheckBox> - <CheckBox IsChecked="{Binding HideCursorOnIdle}"> - <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" /> - </CheckBox> + <StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal"> + <TextBlock VerticalAlignment="Center" + Text="{locale:Locale SettingsTabGeneralHideCursor}" + Width="150" /> + <ComboBox SelectedIndex="{Binding HideCursor}" + HorizontalContentAlignment="Left" + MinWidth="100"> + <ComboBoxItem> + <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorNever}" /> + </ComboBoxItem> + <ComboBoxItem> + <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" /> + </ComboBoxItem> + <ComboBoxItem> + <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorAlways}" /> + </ComboBoxItem> + </ComboBox> + </StackPanel> </StackPanel> <Separator Height="1" /> <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGeneralGameDirectories}" /> @@ -105,7 +120,7 @@ <RowDefinition /> <RowDefinition /> </Grid.RowDefinitions> - <CheckBox + <CheckBox IsChecked="{Binding EnableCustomTheme}" ToolTip.Tip="{locale:Locale CustomThemeCheckTooltip}"> <TextBlock Text="{locale:Locale SettingsTabGeneralThemeEnableCustomTheme}" /> @@ -122,7 +137,7 @@ Grid.Column="1" Margin="0,10,0,0" Text="{Binding CustomThemePath}" /> - <Button + <Button Grid.Row="1" Grid.Column="2" Margin="10,10,0,0" @@ -153,4 +168,4 @@ </StackPanel> </Border> </ScrollViewer> -</UserControl>
\ No newline at end of file +</UserControl> |