asgardius/Ryujinx
1
0
Fork 0
mirror of https://github.com/GreemDev/Ryujinx synced 2025-01-27 15:57:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add the controller image back

Browse source
This commit is contained in:
Evan Husted 2025-01-24 22:24:02 -06:00
parent 85547874c8
commit 6a283190b3
2 changed files with 83 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

157
src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
View file

@ -325,90 +325,97 @@
CornerRadius="5" CornerRadius="5"
Margin="0,10" Margin="0,10"
MinHeight="90"> MinHeight="90">
<StackPanel <StackPanel Orientation="Vertical">
Margin="10" <Image
Orientation="Horizontal" Margin="5,10"
Spacing="20" MaxHeight="300"
HorizontalAlignment="Center"> HorizontalAlignment="Stretch"
<Border VerticalAlignment="Stretch"
BorderBrush="{DynamicResource ThemeControlBorderColor}" Source="{Binding Image}" />
BorderThickness="1" <StackPanel
CornerRadius="5" Margin="10"
Height="{Binding Visualizer.UiStickBorderSize}" Orientation="Horizontal"
Width="{Binding Visualizer.UiStickBorderSize}" Spacing="20"
IsVisible="{Binding IsLeft}"> HorizontalAlignment="Center">
<Canvas <Border
Background="{DynamicResource ThemeBackgroundColor}" BorderBrush="{DynamicResource ThemeControlBorderColor}"
Height="{Binding Visualizer.UiCanvasSize}" BorderThickness="1"
Width="{Binding Visualizer.UiCanvasSize}"> CornerRadius="5"
<Grid Height="{Binding Visualizer.UiStickBorderSize}"
Width="{Binding Visualizer.UiStickBorderSize}"
IsVisible="{Binding IsLeft}">
<Canvas
Background="{DynamicResource ThemeBackgroundColor}"
Height="{Binding Visualizer.UiCanvasSize}" Height="{Binding Visualizer.UiCanvasSize}"
Width="{Binding Visualizer.UiCanvasSize}" Width="{Binding Visualizer.UiCanvasSize}">
Background="{DynamicResource ThemeBackgroundColor}"> <Grid
<Ellipse Height="{Binding Visualizer.UiCanvasSize}"
HorizontalAlignment="Center"
Stroke="Black"
StrokeThickness="1"
Width="{Binding Visualizer.UiCanvasSize}" Width="{Binding Visualizer.UiCanvasSize}"
Height="{Binding Visualizer.UiCanvasSize}"/> Background="{DynamicResource ThemeBackgroundColor}">
<Ellipse
HorizontalAlignment="Center"
Stroke="Black"
StrokeThickness="1"
Width="{Binding Visualizer.UiCanvasSize}"
Height="{Binding Visualizer.UiCanvasSize}" />
<Ellipse
HorizontalAlignment="Center"
Fill="Gray"
Opacity="100"
Height="{Binding Visualizer.UiDeadzoneLeft}"
Width="{Binding Visualizer.UiDeadzoneLeft}" />
</Grid>
<Ellipse <Ellipse
HorizontalAlignment="Center" Fill="Red"
Fill="Gray" Width="{Binding Visualizer.UiStickCircumference}"
Opacity="100" Height="{Binding Visualizer.UiStickCircumference}"
Height="{Binding Visualizer.UiDeadzoneLeft}" Canvas.Bottom="{Binding Visualizer.UiStickLeftY}"
Width="{Binding Visualizer.UiDeadzoneLeft}"/>
</Grid>
<Ellipse
Fill="Red"
Width="{Binding Visualizer.UiStickCircumference}"
Height="{Binding Visualizer.UiStickCircumference}"
Canvas.Bottom="{Binding Visualizer.UiStickLeftY}"
Canvas.Left="{Binding Visualizer.UiStickLeftX}" /> Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
</Canvas> </Canvas>
</Border> </Border>
<Border <Border
BorderBrush="{DynamicResource ThemeControlBorderColor}" BorderBrush="{DynamicResource ThemeControlBorderColor}"
BorderThickness="1" BorderThickness="1"
CornerRadius="5" CornerRadius="5"
Height="{Binding Visualizer.UiStickBorderSize}" Height="{Binding Visualizer.UiStickBorderSize}"
Width="{Binding Visualizer.UiStickBorderSize}" Width="{Binding Visualizer.UiStickBorderSize}"
IsVisible="{Binding IsRight}"> IsVisible="{Binding IsRight}">
<Canvas <Canvas
Background="{DynamicResource ThemeBackgroundColor}" Background="{DynamicResource ThemeBackgroundColor}"
Height="{Binding Visualizer.UiCanvasSize}"
Width="{Binding Visualizer.UiCanvasSize}">
<Grid
Height="{Binding Visualizer.UiCanvasSize}" Height="{Binding Visualizer.UiCanvasSize}"
Width="{Binding Visualizer.UiCanvasSize}" Width="{Binding Visualizer.UiCanvasSize}">
Background="{DynamicResource ThemeBackgroundColor}"> <Grid
<Ellipse Height="{Binding Visualizer.UiCanvasSize}"
HorizontalAlignment="Center"
Stroke="Black"
StrokeThickness="1"
Width="{Binding Visualizer.UiCanvasSize}" Width="{Binding Visualizer.UiCanvasSize}"
Height="{Binding Visualizer.UiCanvasSize}"/> Background="{DynamicResource ThemeBackgroundColor}">
<Ellipse
HorizontalAlignment="Center"
Stroke="Black"
StrokeThickness="1"
Width="{Binding Visualizer.UiCanvasSize}"
Height="{Binding Visualizer.UiCanvasSize}" />
<Ellipse
HorizontalAlignment="Center"
Fill="Gray"
Opacity="100"
Height="{Binding Visualizer.UiDeadzoneRight}"
Width="{Binding Visualizer.UiDeadzoneRight}" />
</Grid>
<Ellipse <Ellipse
HorizontalAlignment="Center" Fill="Red"
Fill="Gray" Width="{Binding Visualizer.UiStickCircumference}"
Opacity="100" Height="{Binding Visualizer.UiStickCircumference}"
Height="{Binding Visualizer.UiDeadzoneRight}" Canvas.Bottom="{Binding Visualizer.UiStickRightY}"
Width="{Binding Visualizer.UiDeadzoneRight}"/>
</Grid>
<Ellipse
Fill="Red"
Width="{Binding Visualizer.UiStickCircumference}"
Height="{Binding Visualizer.UiStickCircumference}"
Canvas.Bottom="{Binding Visualizer.UiStickRightY}"
Canvas.Left="{Binding Visualizer.UiStickRightX}" /> Canvas.Left="{Binding Visualizer.UiStickRightX}" />
</Canvas> </Canvas>
</Border> </Border>
</StackPanel>
</StackPanel> </StackPanel>
</Border> </Border>
<Border <Border
BorderBrush="{DynamicResource ThemeControlBorderColor}" BorderBrush="{DynamicResource ThemeControlBorderColor}"
BorderThickness="1" BorderThickness="1"
CornerRadius="5" CornerRadius="5">
MinHeight="90">
<StackPanel <StackPanel
Margin="8" Margin="8"
Orientation="Vertical"> Orientation="Vertical">
@ -427,8 +434,8 @@
Minimum="0" Minimum="0"
Value="{Binding Config.TriggerThreshold, Mode=TwoWay}" /> Value="{Binding Config.TriggerThreshold, Mode=TwoWay}" />
<TextBlock <TextBlock
Width="25" Width="25"
Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" /> Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Orientation="Vertical" Orientation="Vertical"
@ -603,7 +610,7 @@
IsChecked="{Binding Config.UseRainbowLed, Mode=TwoWay}"> IsChecked="{Binding Config.UseRainbowLed, Mode=TwoWay}">
<TextBlock Text="{ext:Locale ControllerSettingsLedColorRainbow}" /> <TextBlock Text="{ext:Locale ControllerSettingsLedColorRainbow}" />
</CheckBox> </CheckBox>
<ui:ColorPickerButton <ui:ColorPickerButton
Grid.Column="3" Grid.Column="3"
IsEnabled="{Binding Config.ShowLedColorPicker}" IsEnabled="{Binding Config.ShowLedColorPicker}"
Margin="5, 10, 10, 10" Margin="5, 10, 10, 10"

2
src/Ryujinx/UI/Windows/SettingsWindow.axaml
View file

@ -11,7 +11,7 @@
xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings" xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
Width="1100" Width="1100"
Height="768" Height="850"
MinWidth="800" MinWidth="800"
MinHeight="480" MinHeight="480"
WindowStartupLocation="CenterOwner" WindowStartupLocation="CenterOwner"