From c405a19b73fa1e084918a2d39336363cd0f8b567 Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Mon, 20 Sep 2021 19:47:45 -0500
Subject: yuzu: Update frontend

---
 src/yuzu/configuration/configure_input_player.ui | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src/yuzu/configuration/configure_input_player.ui')

diff --git a/src/yuzu/configuration/configure_input_player.ui b/src/yuzu/configuration/configure_input_player.ui
index e7433912b..14ca02fd8 100644
--- a/src/yuzu/configuration/configure_input_player.ui
+++ b/src/yuzu/configuration/configure_input_player.ui
@@ -148,16 +148,6 @@
               <height>21</height>
              </size>
             </property>
-            <item>
-             <property name="text">
-              <string>Any</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Keyboard/Mouse</string>
-             </property>
-            </item>
            </widget>
           </item>
           <item>
-- 
cgit v1.2.3


From 730f07830247cfcdc551c253d30c6717fc16316c Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Sun, 31 Oct 2021 10:41:44 -0500
Subject: settings: Fix Debug controller type options

---
 src/yuzu/configuration/configure_input_player.ui | 25 ------------------------
 1 file changed, 25 deletions(-)

(limited to 'src/yuzu/configuration/configure_input_player.ui')

diff --git a/src/yuzu/configuration/configure_input_player.ui b/src/yuzu/configuration/configure_input_player.ui
index 14ca02fd8..958a89229 100644
--- a/src/yuzu/configuration/configure_input_player.ui
+++ b/src/yuzu/configuration/configure_input_player.ui
@@ -89,31 +89,6 @@
               <height>21</height>
              </size>
             </property>
-            <item>
-             <property name="text">
-              <string>Pro Controller</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Dual Joycons</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Left Joycon</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Right Joycon</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Handheld</string>
-             </property>
-            </item>
            </widget>
           </item>
          </layout>
-- 
cgit v1.2.3


From 690013b342e6d9a9561017b2e94f42acfde25147 Mon Sep 17 00:00:00 2001
From: Levi Behunin <l3ehunin@gmail.com>
Date: Thu, 4 Nov 2021 16:09:57 -0600
Subject:  UI nits Set top margin to 6 on Right Stick, LeftStick, Face Buttons,
 D-Pad. Change property on Input Device QComboBox from minimumSize to
 minimumContentsLength.

---
 src/yuzu/configuration/configure_input_player.ui | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/yuzu/configuration/configure_input_player.ui')

diff --git a/src/yuzu/configuration/configure_input_player.ui b/src/yuzu/configuration/configure_input_player.ui
index 958a89229..756a414b5 100644
--- a/src/yuzu/configuration/configure_input_player.ui
+++ b/src/yuzu/configuration/configure_input_player.ui
@@ -117,11 +117,8 @@
           </property>
           <item>
            <widget class="QComboBox" name="comboDevices">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>21</height>
-             </size>
+            <property name="minimumContentsLength">
+             <number>60</number>
             </property>
            </widget>
           </item>
@@ -307,7 +304,7 @@
                <number>3</number>
               </property>
               <property name="topMargin">
-               <number>0</number>
+               <number>6</number>
               </property>
               <property name="rightMargin">
                <number>3</number>
@@ -883,7 +880,7 @@
                <number>3</number>
               </property>
               <property name="topMargin">
-               <number>0</number>
+               <number>6</number>
               </property>
               <property name="rightMargin">
                <number>3</number>
@@ -2186,7 +2183,7 @@
                <number>3</number>
               </property>
               <property name="topMargin">
-               <number>0</number>
+               <number>6</number>
               </property>
               <property name="rightMargin">
                <number>3</number>
@@ -2535,7 +2532,7 @@
                <number>3</number>
               </property>
               <property name="topMargin">
-               <number>0</number>
+               <number>6</number>
               </property>
               <property name="rightMargin">
                <number>3</number>
-- 
cgit v1.2.3