From b9cf223d86ae64bc6f4421d242eca1d64af2073d Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Fri, 19 May 2023 10:08:24 -0400
Subject: [PATCH] Visual fixes and improvements

One weird bug
---
 .../Input/KeyboardInputViewModel.cs           |  4 +++
 .../UI/Views/Input/ControllerInputView.axaml  | 22 +++++++--------
 .../UI/Views/Input/KeyboardInputView.axaml    | 28 +++++++++----------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/Ryujinx.Ava/UI/ViewModels/Input/KeyboardInputViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/Input/KeyboardInputViewModel.cs
index 6e886d0b8..b9f4c8602 100644
--- a/src/Ryujinx.Ava/UI/ViewModels/Input/KeyboardInputViewModel.cs
+++ b/src/Ryujinx.Ava/UI/ViewModels/Input/KeyboardInputViewModel.cs
@@ -24,6 +24,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 _isLeft = value;
                 OnPropertyChanged();
+                OnPropertyChanged(nameof(HasSides));
             }
         }
 
@@ -35,9 +36,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 _isRight = value;
                 OnPropertyChanged();
+                OnPropertyChanged(nameof(HasSides));
             }
         }
 
+        public bool HasSides => IsLeft ^ IsRight;
+
         private SvgImage _image;
         public SvgImage Image
         {
diff --git a/src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml b/src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml
index e7c1d54ca..6cf873071 100644
--- a/src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml
+++ b/src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml
@@ -316,6 +316,13 @@
                 Grid.Column="1"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
+                <!-- Controller Picture -->
+                <Image
+                    Margin="0,10"
+                    MaxHeight="300"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Source="{Binding Image}" />
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
@@ -346,7 +353,7 @@
                             Margin="0,4,0,0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            IsVisible="{Binding !IsRight}"
+                            IsVisible="{Binding IsLeft}"
                             Orientation="Horizontal">
                             <TextBlock
                                 Width="20"
@@ -364,7 +371,7 @@
                             Margin="0,4,0,0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            IsVisible="{Binding !IsRight}"
+                            IsVisible="{Binding IsLeft}"
                             Orientation="Horizontal">
                             <TextBlock
                                 Width="20"
@@ -382,7 +389,7 @@
                             Margin="0,4,0,0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            IsVisible="{Binding !IsLeft}"
+                            IsVisible="{Binding IsRight}"
                             Orientation="Horizontal">
                             <TextBlock
                                 Width="20"
@@ -400,7 +407,7 @@
                             Margin="0,4,0,0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            IsVisible="{Binding !IsLeft}"
+                            IsVisible="{Binding IsRight}"
                             Orientation="Horizontal">
                             <TextBlock
                                 Width="20"
@@ -416,13 +423,6 @@
                         </StackPanel>
                     </StackPanel>
                 </Border>
-                <!-- Controller Picture -->
-                <Image
-                    Margin="0,10,0,0"
-                    MaxHeight="300"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Source="{Binding Image}" />
                 <!-- Motion + Rumble -->
                 <StackPanel
                     Margin="0,10,0,0"
diff --git a/src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml b/src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml
index 5e5348c63..e4566f463 100644
--- a/src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml
+++ b/src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml
@@ -311,22 +311,27 @@
                 Grid.Column="1"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
+                <!-- Controller Picture -->
+                <Image
+                    Margin="0,10"
+                    MaxHeight="300"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Source="{Binding Image}" />
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
                     CornerRadius="5"
-                    MinHeight="90">
+                    MinHeight="90"
+                    IsVisible="{Binding HasSides}">
                     <StackPanel
                         Margin="8"
                         Orientation="Vertical">
-                        <TextBlock
-                            HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsTriggerThreshold}" />
                         <StackPanel
                             Margin="0,4,0,0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            IsVisible="{Binding !IsRight}"
+                            IsVisible="{Binding IsLeft}"
                             Orientation="Horizontal">
                             <TextBlock
                                 Width="20"
@@ -344,7 +349,7 @@
                             Margin="0,4,0,0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            IsVisible="{Binding !IsRight}"
+                            IsVisible="{Binding IsLeft}"
                             Orientation="Horizontal">
                             <TextBlock
                                 Width="20"
@@ -362,7 +367,7 @@
                             Margin="0,4,0,0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            IsVisible="{Binding !IsLeft}"
+                            IsVisible="{Binding IsRight}"
                             Orientation="Horizontal">
                             <TextBlock
                                 Width="20"
@@ -380,7 +385,7 @@
                             Margin="0,4,0,0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            IsVisible="{Binding !IsLeft}"
+                            IsVisible="{Binding IsRight}"
                             Orientation="Horizontal">
                             <TextBlock
                                 Width="20"
@@ -396,13 +401,6 @@
                         </StackPanel>
                     </StackPanel>
                 </Border>
-                <!-- Controller Picture -->
-                <Image
-                    Margin="0,10,0,0"
-                    MaxHeight="300"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Source="{Binding Image}" />
             </StackPanel>
             <!-- Right Controls -->
             <StackPanel