From 979d387f5da40a384274d48107fef718d24e28a8 Mon Sep 17 00:00:00 2001
From: MutantAura <domw0401@gmail.com>
Date: Thu, 30 May 2024 18:45:57 +0100
Subject: [PATCH] Cleanup AXAML and hide sticks when only one is present on
 guest controller.

---
 .../UI/Views/Input/ControllerInputView.axaml   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
index 1b16b94bc..b18eb882f 100644
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
@@ -318,7 +318,7 @@
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
                 <!-- Controller Picture -->
-                 <Border
+                <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
                     CornerRadius="5"
@@ -334,7 +334,8 @@
                             BorderThickness="1"
                             CornerRadius="5"
                             Height="{Binding UiStickBorderSize}"
-                            Width="{Binding UiStickBorderSize}">
+                            Width="{Binding UiStickBorderSize}"
+                            IsVisible="{Binding IsLeft}">
                             <Canvas
                                 Background="{DynamicResource ThemeBackgroundColor}"
                                 Height="{Binding UiCanvasSize}"
@@ -348,9 +349,7 @@
                                         Stroke="Black"
                                         StrokeThickness="1"
                                         Width="{Binding UiCanvasSize}"
-                                        Height="{Binding UiCanvasSize}"
-                                        Canvas.Bottom="2"
-                                        Canvas.Left="2" />
+                                        Height="{Binding UiCanvasSize}"/>
                                     <Ellipse
                                         HorizontalAlignment="Center"
                                         Fill="Gray"
@@ -366,12 +365,13 @@
                                         Canvas.Left="{Binding UiStickLeftX}" />
                             </Canvas>
                         </Border>        
-                            <Border
+                        <Border
                             BorderBrush="{DynamicResource ThemeControlBorderColor}"
                             BorderThickness="1"
                             CornerRadius="5"
                             Height="{Binding UiStickBorderSize}"
-                            Width="{Binding UiStickBorderSize}">
+                            Width="{Binding UiStickBorderSize}"
+                            IsVisible="{Binding IsRight}">
                             <Canvas
                                 Background="{DynamicResource ThemeBackgroundColor}"
                                 Height="{Binding UiCanvasSize}"
@@ -385,9 +385,7 @@
                                         Stroke="Black"
                                         StrokeThickness="1"
                                         Width="{Binding UiCanvasSize}"
-                                        Height="{Binding UiCanvasSize}"
-                                        Canvas.Bottom="2"
-                                        Canvas.Left="2" />
+                                        Height="{Binding UiCanvasSize}"/>
                                     <Ellipse
                                         HorizontalAlignment="Center"
                                         Fill="Gray"