Simplified Solution To Jagged Resizing

This commit is contained in:
_Neo_ 2025-11-26 15:07:20 +02:00
parent c00f8aad58
commit 96a6a57ed2
3 changed files with 20 additions and 20 deletions

View file

@ -9,30 +9,30 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:DataType="viewModels:LedInputViewModel" x:DataType="viewModels:LedInputViewModel"
x:Class="Ryujinx.UI.Views.Input.LedInputView"> x:Class="Ryujinx.UI.Views.Input.LedInputView">
<Grid Margin="10" HorizontalAlignment="Center" RowDefinitions="Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,Auto"> <StackPanel Margin="10" HorizontalAlignment="Center">
<CheckBox Grid.Row="0" Margin="0,0,0,2.5" IsChecked="{Binding TurnOffLed, Mode=TwoWay}" <CheckBox Margin="0,0,0,2.5" IsChecked="{Binding TurnOffLed, Mode=TwoWay}"
Command="{Binding LedDisabledChanged}" IsVisible="{Binding ParentModel.CanClearLed}"> Command="{Binding LedDisabledChanged}" IsVisible="{Binding ParentModel.CanClearLed}">
<TextBlock Text="{ext:Locale ControllerSettingsLedColorDisable}" /> <TextBlock Text="{ext:Locale ControllerSettingsLedColorDisable}" />
</CheckBox> </CheckBox>
<CheckBox Grid.Row="1" Margin="0,0,0,2.5" IsChecked="{Binding UseRainbowLed, Mode=TwoWay}"> <CheckBox Margin="0,0,0,2.5" IsChecked="{Binding UseRainbowLed, Mode=TwoWay}">
<TextBlock Text="{ext:Locale ControllerSettingsLedColorRainbow}" /> <TextBlock Text="{ext:Locale ControllerSettingsLedColorRainbow}" />
</CheckBox> </CheckBox>
<StackPanel Grid.Row="2" Orientation="Horizontal" IsEnabled="{Binding !TurnOffLed}"> <StackPanel Orientation="Horizontal" Margin="0,0,0,2.5" IsEnabled="{Binding !TurnOffLed}">
<TextBlock Margin="0,0,10,2.5" Text="{ext:Locale ControllerSettingsLedColorRainbowSpeed}" /> <TextBlock Margin="0,0,10,0" VerticalAlignment="Center" Text="{ext:Locale ControllerSettingsLedColorRainbowSpeed}" />
<controls:SliderScroll <controls:SliderScroll
Value="{Binding RainbowSpeed}"
Width="150" Width="150"
Margin="0,0,0,2.5" VerticalAlignment="Center"
Value="{Binding RainbowSpeed}"
TickFrequency="0.25" TickFrequency="0.25"
IsSnapToTickEnabled="True" IsSnapToTickEnabled="True"
LargeChange="1" LargeChange="1"
SmallChange="0.25" SmallChange="0.25"
Minimum="0" Minimum="0"
Maximum="10" /> Maximum="10" />
<TextBlock Margin="5,0,0,2.5" Text="{Binding RainbowSpeedText}" /> <TextBlock Width="40" Margin="5,0,0,0" VerticalAlignment="Center" Text="{Binding RainbowSpeedText}" />
</StackPanel> </StackPanel>
<StackPanel Grid.Row="3" Orientation="Horizontal" IsEnabled="{Binding ShowLedColorPicker}"> <StackPanel Orientation="Horizontal" IsEnabled="{Binding ShowLedColorPicker}">
<TextBlock Text="{ext:Locale ControllerSettingsLedColor}" /> <TextBlock VerticalAlignment="Center" Text="{ext:Locale ControllerSettingsLedColor}" />
<ui:ColorPickerButton <ui:ColorPickerButton
Margin="20,0,0,0" Margin="20,0,0,0"
IsMoreButtonVisible="False" IsMoreButtonVisible="False"
@ -46,5 +46,5 @@
Color="{Binding LedColor, Mode=TwoWay}"> Color="{Binding LedColor, Mode=TwoWay}">
</ui:ColorPickerButton> </ui:ColorPickerButton>
</StackPanel> </StackPanel>
</Grid> </StackPanel>
</UserControl> </UserControl>

View file

@ -13,13 +13,13 @@
Focusable="True"> Focusable="True">
<StackPanel> <StackPanel>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<Grid Margin="10,0,10,0" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,Auto"> <Grid Margin="10,0,10,0" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,45">
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="0,0,10,0" Margin="5,0,10,0"
Text="{ext:Locale ControllerSettingsMotionGyroSensitivity}" /> Text="{ext:Locale ControllerSettingsMotionGyroSensitivity}" />
<controls:SliderScroll <controls:SliderScroll
Grid.Row="0" Grid.Row="0"
@ -38,14 +38,14 @@
Grid.Column="2" Grid.Column="2"
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="5,0,5,1" Margin="0,0,0,1"
Text="{Binding Sensitivity, StringFormat=\{0:0\}%}" /> Text="{Binding Sensitivity, StringFormat=\{0:0\}%}" />
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="0,0,10,0" Margin="5,0,10,0"
Text="{ext:Locale ControllerSettingsMotionGyroDeadzone}" /> Text="{ext:Locale ControllerSettingsMotionGyroDeadzone}" />
<controls:SliderScroll <controls:SliderScroll
Grid.Row="1" Grid.Row="1"
@ -64,7 +64,7 @@
Grid.Column="2" Grid.Column="2"
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="5,0,5,1" Margin="0,0,0,1"
Text="{Binding GyroDeadzone, StringFormat=\{0:0.00\}}" /> Text="{Binding GyroDeadzone, StringFormat=\{0:0.00\}}" />
</Grid> </Grid>
<Separator Height="1" Margin="0,0,0,5" /> <Separator Height="1" Margin="0,0,0,5" />

View file

@ -10,7 +10,7 @@
x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView" x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView"
x:DataType="viewModels:RumbleInputViewModel" x:DataType="viewModels:RumbleInputViewModel"
Focusable="True"> Focusable="True">
<Grid Margin="10,10,10,0" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,Auto"> <Grid Margin="10,10,10,0" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,45">
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
@ -29,7 +29,7 @@
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Grid.Column="2" Grid.Column="2"
Margin="5,0,5,1" Margin="5,0,0,1"
Text="{Binding StrongRumble, StringFormat=\{0:0.00\}}" /> Text="{Binding StrongRumble, StringFormat=\{0:0.00\}}" />
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
@ -49,7 +49,7 @@
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
Grid.Column="2" Grid.Column="2"
Margin="5,0,5,1" Margin="5,0,0,1"
Text="{Binding WeakRumble, StringFormat=\{0:0.00\}}" /> Text="{Binding WeakRumble, StringFormat=\{0:0.00\}}" />
</Grid> </Grid>
</UserControl> </UserControl>