From 9d4edd4e88d291aa4b778b74f6e9daa9dd358d2b Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Sun, 13 Sep 2020 09:25:22 -0400
Subject: [PATCH] ui/themes: Cleanup UI
---
dist/qt_themes/default/style.qss | 14 +-
dist/qt_themes/qdarkstyle/style.qss | 71 ++----
.../qdarkstyle_midnight_blue/style.qss | 81 ++----
src/yuzu/aboutdialog.ui | 20 --
src/yuzu/applets/controller.ui | 31 +--
src/yuzu/configuration/configure.ui | 20 --
.../configure_debug_controller.ui | 20 --
src/yuzu/configuration/configure_input.ui | 24 +-
.../configure_input_advanced.cpp | 4 +-
.../configuration/configure_input_advanced.ui | 192 +++++++-------
.../configuration/configure_input_player.ui | 241 ++++++++++--------
.../configuration/configure_motion_touch.ui | 10 -
.../configuration/configure_mouse_advanced.ui | 46 +---
src/yuzu/configuration/configure_per_game.ui | 20 --
.../configure_touch_from_button.ui | 10 -
.../configure_touchscreen_advanced.ui | 22 +-
16 files changed, 326 insertions(+), 500 deletions(-)
diff --git a/dist/qt_themes/default/style.qss b/dist/qt_themes/default/style.qss
index b6dd2063d..836dd25ca 100644
--- a/dist/qt_themes/default/style.qss
+++ b/dist/qt_themes/default/style.qss
@@ -1,3 +1,7 @@
+QAbstractSpinBox {
+ min-height: 19px;
+}
+
QPushButton#TogglableStatusBarButton {
color: #959595;
border: 1px solid transparent;
@@ -35,10 +39,10 @@ QPushButton#RendererStatusBarButton:!checked {
}
QPushButton#buttonRefreshDevices {
- min-width: 20px;
- min-height: 20px;
- max-width: 20px;
- max-height: 20px;
+ min-width: 21px;
+ min-height: 21px;
+ max-width: 21px;
+ max-height: 21px;
}
QWidget#bottomPerGameInput,
@@ -71,7 +75,7 @@ QWidget#middleControllerApplet {
QWidget#topPerGameInput QComboBox,
QWidget#middleControllerApplet QComboBox {
- width: 123px;
+ width: 120px;
}
QWidget#connectedControllers {
diff --git a/dist/qt_themes/qdarkstyle/style.qss b/dist/qt_themes/qdarkstyle/style.qss
index 66026e8be..aca6531ac 100644
--- a/dist/qt_themes/qdarkstyle/style.qss
+++ b/dist/qt_themes/qdarkstyle/style.qss
@@ -99,12 +99,19 @@ QGroupBox::indicator:unchecked:disabled {
}
QRadioButton {
- spacing: 5px;
- outline: none;
color: #eff0f1;
+ spacing: 3px;
+ padding: 0px;
+ border: none;
+ outline: none;
margin-bottom: 2px;
}
+QGroupBox QRadioButton {
+ padding-left: 0px;
+ padding-right: 7px;
+}
+
QRadioButton:disabled {
color: #76797C;
}
@@ -522,13 +529,12 @@ QToolButton#qt_toolbar_ext_button {
QPushButton {
color: #eff0f1;
- border-width: 1px;
- border-color: #54575B;
- border-style: solid;
- padding: 6px 4px;
+ border: 1px solid #54575B;
border-radius: 2px;
+ padding: 5px 0px 5px 0px;
outline: none;
min-width: 100px;
+ min-height: 13px;
background-color: #232629;
}
@@ -553,8 +559,9 @@ QComboBox {
selection-background-color: #3daee9;
border: 1px solid #54575B;
border-radius: 2px;
- padding: 4px 6px;
- min-width: 75px;
+ padding: 0px 4px 0px 4px;
+ min-width: 60px;
+ min-height: 23px;
background-color: #232629;
}
@@ -608,26 +615,26 @@ QComboBox::down-arrow:focus {
}
QAbstractSpinBox {
- padding: 4px 6px;
border: 1px solid #54575B;
background-color: #232629;
color: #eff0f1;
border-radius: 2px;
- min-width: 75px;
+ min-width: 52px;
+ min-height: 23px;
}
QAbstractSpinBox:up-button {
background-color: transparent;
subcontrol-origin: border;
subcontrol-position: center right;
- left: -6px;
+ left: -2px;
}
QAbstractSpinBox:down-button {
background-color: transparent;
subcontrol-origin: border;
subcontrol-position: center left;
- right: -6px;
+ right: -2px;
}
QAbstractSpinBox::up-arrow,
@@ -1277,34 +1284,17 @@ QPushButton#RendererStatusBarButton:!checked {
}
QPushButton#buttonRefreshDevices {
- min-width: 24px;
- min-height: 24px;
- max-width: 24px;
- max-height: 24px;
+ min-width: 23px;
+ min-height: 23px;
+ max-width: 23px;
+ max-height: 23px;
padding: 0px 0px;
}
QSpinBox#spinboxLStickRange,
-QSpinBox#spinboxRStickRange {
- padding: 4px 0px 5px 0px;
- min-width: 63px;
-}
-
+QSpinBox#spinboxRStickRange,
QSpinBox#vibrationSpin {
- padding: 4px 0px 5px 0px;
- min-width: 63px;
-}
-
-QSpinBox#spinboxLStickRange:up-button,
-QSpinBox#spinboxRStickRange:up-button,
-QSpinBox#vibrationSpin:up-button {
- left: -2px;
-}
-
-QSpinBox#spinboxLStickRange:down-button,
-QSpinBox#spinboxRStickRange:down-button,
-QSpinBox#vibrationSpin:down-button {
- right: -1px;
+ min-width: 68px;
}
QGroupBox#motionGroup::indicator,
@@ -1340,16 +1330,7 @@ QWidget#middleControllerApplet {
QWidget#topPerGameInput QComboBox,
QWidget#middleControllerApplet QComboBox {
- width: 119px;
-}
-
-QRadioButton#radioDocked {
- margin-left: -3px;
-}
-
-
-QRadioButton#radioUndocked {
- margin-right: 5px;
+ width: 120px;
}
QWidget#connectedControllers {
diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss
index c6318ba4e..ad032a966 100644
--- a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss
+++ b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss
@@ -172,8 +172,8 @@ QCheckBox {
color: #F0F0F0;
spacing: 4px;
outline: none;
- padding-top: 4px;
- padding-bottom: 4px;
+ padding-top: 2px;
+ padding-bottom: 2px;
}
QCheckBox:focus {
@@ -239,7 +239,7 @@ QGroupBox {
border: 1px solid #32414B;
border-radius: 4px;
margin-top: 12px;
- padding: 4px;
+ padding: 2px;
}
QGroupBox::title {
@@ -247,7 +247,7 @@ QGroupBox::title {
subcontrol-position: top left;
padding-left: 3px;
padding-right: 5px;
- padding-top: 4px;
+ padding-top: 2px;
}
QGroupBox::indicator {
@@ -298,6 +298,11 @@ QRadioButton {
outline: none;
}
+QGroupBox QRadioButton {
+ padding-left: 0px;
+ padding-right: 7px;
+}
+
QRadioButton:focus {
border: none;
}
@@ -321,7 +326,6 @@ QRadioButton QWidget {
QRadioButton::indicator {
border: none;
outline: none;
- margin-left: 4px;
height: 16px;
width: 16px;
}
@@ -785,14 +789,8 @@ QAbstractSpinBox {
background-color: #19232D;
border: 1px solid #32414B;
color: #F0F0F0;
- /* This fixes 103, 111 */
- padding-top: 2px;
- /* This fixes 103, 111 */
- padding-bottom: 2px;
- padding-left: 4px;
- padding-right: 4px;
border-radius: 4px;
- /* min-width: 5px; removed to fix 109 */
+ min-height: 19px;
}
QAbstractSpinBox:up-button {
@@ -997,10 +995,11 @@ QPushButton {
border: 1px solid #32414B;
color: #F0F0F0;
border-radius: 4px;
- padding: 3px;
+ padding: 3px 0px 3px 0px;
outline: none;
/* Issue #194 - Special case of QPushButton inside dialogs, for better UI */
min-width: 80px;
+ min-height: 13px;
}
QPushButton:disabled {
@@ -1008,14 +1007,14 @@ QPushButton:disabled {
border: 1px solid #32414B;
color: #787878;
border-radius: 4px;
- padding: 3px;
+ padding: 3px 0px 3px 0px;
}
QPushButton:checked {
background-color: #32414B;
border: 1px solid #32414B;
border-radius: 4px;
- padding: 3px;
+ padding: 3px 0px 3px 0px;
outline: none;
}
@@ -1024,7 +1023,7 @@ QPushButton:checked:disabled {
border: 1px solid #32414B;
color: #787878;
border-radius: 4px;
- padding: 3px;
+ padding: 3px 0px 3px 0px;
outline: none;
}
@@ -1197,15 +1196,9 @@ QComboBox {
border: 1px solid #32414B;
border-radius: 4px;
selection-background-color: #1464A0;
- padding-left: 4px;
- padding-right: 36px;
- /* 4 + 16*2 See scrollbar size */
- /* Fixes #103, #111 */
- min-height: 1.5em;
- /* padding-top: 2px; removed to fix #132 */
- /* padding-bottom: 2px; removed to fix #132 */
- /* min-width: 75px; removed to fix #109 */
- /* Needed to remove indicator - fix #132 */
+ padding: 0px 4px 0px 4px;
+ min-width: 60px;
+ min-height: 19px;
}
QComboBox QAbstractItemView {
@@ -2198,16 +2191,17 @@ QPushButton#RendererStatusBarButton:!checked {
}
QPushButton#buttonRefreshDevices {
- min-width: 20px;
- min-height: 20px;
- max-width: 20px;
- max-height: 20px;
+ min-width: 19px;
+ min-height: 19px;
+ max-width: 19px;
+ max-height: 19px;
padding: 0px 0px;
}
QSpinBox#spinboxLStickRange,
-QSpinBox#spinboxRStickRange {
- min-width: 38px;
+QSpinBox#spinboxRStickRange,
+QSpinBox#vibrationSpin {
+ min-width: 68px;
}
QGroupBox#motionGroup::indicator,
@@ -2260,26 +2254,7 @@ QWidget#middleControllerApplet {
QWidget#topPerGameInput QComboBox,
QWidget#middleControllerApplet QComboBox {
- padding-right: 2px;
- width: 127px;
-}
-
-QGroupBox#handheldGroup {
- padding-left: 0px;
-}
-
-QRadioButton#radioDocked {
- margin-left: -1px;
- padding-left: 0px;
-}
-
-QRadioButton#radioDocked::indicator {
- margin-left: 0px;
-}
-
-
-QRadioButton#radioUndocked {
- margin-right: 2px;
+ width: 120px;
}
QWidget#connectedControllers {
@@ -2352,7 +2327,7 @@ QCheckBox#checkboxPlayer5Connected,
QCheckBox#checkboxPlayer6Connected,
QCheckBox#checkboxPlayer7Connected,
QCheckBox#checkboxPlayer8Connected {
- spacing: 0px;
+ spacing: 0px;
}
QWidget#connectedControllers QLabel {
@@ -2427,7 +2402,7 @@ QCheckBox#checkboxPlayer7Connected::indicator,
QCheckBox#checkboxPlayer8Connected::indicator {
width: 14px;
height: 14px;
- margin-left: 2px;
+ margin-left: 0px;
}
QWidget#Player1LEDs QCheckBox::indicator:checked,
diff --git a/src/yuzu/aboutdialog.ui b/src/yuzu/aboutdialog.ui
index f122ba39d..1b320630c 100644
--- a/src/yuzu/aboutdialog.ui
+++ b/src/yuzu/aboutdialog.ui
@@ -160,32 +160,12 @@ p, li { white-space: pre-wrap; }
accepted()
AboutDialog
accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
buttonBox
rejected()
AboutDialog
reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
diff --git a/src/yuzu/applets/controller.ui b/src/yuzu/applets/controller.ui
index c4108a979..2ab69a2d3 100644
--- a/src/yuzu/applets/controller.ui
+++ b/src/yuzu/applets/controller.ui
@@ -1217,9 +1217,6 @@
-
-
- false
-
-
Pro Controller
@@ -2279,7 +2276,7 @@
6
- 6
+ 8
6
@@ -2335,13 +2332,13 @@
- 65
- 0
+ 68
+ 21
- 65
+ 68
16777215
@@ -2387,18 +2384,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Configure
@@ -2430,12 +2427,12 @@
- 65
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Open
@@ -2657,16 +2654,6 @@
accepted()
QtControllerSelectorDialog
accept()
-
-
- 20
- 20
-
-
- 20
- 20
-
-
diff --git a/src/yuzu/configuration/configure.ui b/src/yuzu/configuration/configure.ui
index fcf42cdcb..f92c3aff3 100644
--- a/src/yuzu/configuration/configure.ui
+++ b/src/yuzu/configuration/configure.ui
@@ -275,32 +275,12 @@
accepted()
ConfigureDialog
accept()
-
-
- 220
- 380
-
-
- 220
- 200
-
-
buttonBox
rejected()
ConfigureDialog
reject()
-
-
- 220
- 380
-
-
- 220
- 200
-
-
diff --git a/src/yuzu/configuration/configure_debug_controller.ui b/src/yuzu/configuration/configure_debug_controller.ui
index a95ed50ff..7b7e6582c 100644
--- a/src/yuzu/configuration/configure_debug_controller.ui
+++ b/src/yuzu/configuration/configure_debug_controller.ui
@@ -66,32 +66,12 @@
accepted()
ConfigureDebugController
accept()
-
-
- 140
- 318
-
-
- 140
- 169
-
-
buttonBox
rejected()
ConfigureDebugController
reject()
-
-
- 140
- 318
-
-
- 140
- 169
-
-
diff --git a/src/yuzu/configuration/configure_input.ui b/src/yuzu/configuration/configure_input.ui
index 136955224..b74481bda 100644
--- a/src/yuzu/configuration/configure_input.ui
+++ b/src/yuzu/configuration/configure_input.ui
@@ -142,7 +142,7 @@
6
- 3
+ 8
6
@@ -198,13 +198,13 @@
- 65
+ 68
21
- 65
+ 68
16777215
@@ -250,18 +250,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Configure
@@ -468,13 +468,13 @@
- 57
+ 68
0
- 55
+ 68
16777215
@@ -494,7 +494,7 @@
Qt::LeftToRight
- min-width: 55px;
+ min-width: 68px;
Defaults
@@ -511,13 +511,13 @@
- 57
+ 68
0
- 55
+ 68
16777215
@@ -537,7 +537,7 @@
Qt::LeftToRight
- min-width: 55px;
+ min-width: 68px;
Clear
diff --git a/src/yuzu/configuration/configure_input_advanced.cpp b/src/yuzu/configuration/configure_input_advanced.cpp
index 81f9dc16c..3715db0ab 100644
--- a/src/yuzu/configuration/configure_input_advanced.cpp
+++ b/src/yuzu/configuration/configure_input_advanced.cpp
@@ -101,7 +101,7 @@ void ConfigureInputAdvanced::OnControllerButtonClick(int player_idx, int button_
}
controllers_colors[player_idx][button_idx] = new_bg_color;
controllers_color_buttons[player_idx][button_idx]->setStyleSheet(
- QStringLiteral("background-color: %1; min-width: 55px;")
+ QStringLiteral("background-color: %1; min-width: 60px;")
.arg(controllers_colors[player_idx][button_idx].name()));
}
@@ -139,7 +139,7 @@ void ConfigureInputAdvanced::LoadConfiguration() {
for (std::size_t button_idx = 0; button_idx < colors.size(); ++button_idx) {
controllers_color_buttons[player_idx][button_idx]->setStyleSheet(
- QStringLiteral("background-color: %1; min-width: 55px;")
+ QStringLiteral("background-color: %1; min-width: 60px;")
.arg(controllers_colors[player_idx][button_idx].name()));
}
}
diff --git a/src/yuzu/configuration/configure_input_advanced.ui b/src/yuzu/configuration/configure_input_advanced.ui
index 5958435fc..a880a7c68 100644
--- a/src/yuzu/configuration/configure_input_advanced.ui
+++ b/src/yuzu/configuration/configure_input_advanced.ui
@@ -192,18 +192,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -247,18 +247,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -323,18 +323,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -378,18 +378,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -478,18 +478,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -533,18 +533,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -609,18 +609,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -664,18 +664,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -782,18 +782,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -837,18 +837,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -913,18 +913,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -968,18 +968,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1068,18 +1068,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1123,18 +1123,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1199,18 +1199,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1254,18 +1254,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1393,18 +1393,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1448,18 +1448,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1524,18 +1524,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1579,18 +1579,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1679,18 +1679,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1734,18 +1734,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1810,18 +1810,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1865,18 +1865,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -1983,18 +1983,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -2038,18 +2038,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -2114,18 +2114,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -2169,18 +2169,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -2269,18 +2269,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -2324,18 +2324,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -2400,18 +2400,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
@@ -2455,18 +2455,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
diff --git a/src/yuzu/configuration/configure_input_player.ui b/src/yuzu/configuration/configure_input_player.ui
index e03461d9d..1e78b4c10 100644
--- a/src/yuzu/configuration/configure_input_player.ui
+++ b/src/yuzu/configuration/configure_input_player.ui
@@ -83,6 +83,12 @@
-
+
+
+ 0
+ 21
+
+
-
Pro Controller
@@ -136,6 +142,12 @@
-
+
+
+ 0
+ 21
+
+
-
Any
@@ -152,14 +164,14 @@
- 24
- 22
+ 21
+ 21
- 24
- 22
+ 21
+ 21
@@ -198,18 +210,25 @@
5
-
-
+
+
+
+ 0
+ 21
+
+
+
-
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Save
@@ -220,12 +239,12 @@
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
New
@@ -236,12 +255,12 @@
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Delete
@@ -393,18 +412,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Up
@@ -463,18 +482,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Left
@@ -512,18 +531,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Right
@@ -594,18 +613,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Down
@@ -664,18 +683,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Pressed
@@ -713,18 +732,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Modifier
@@ -759,13 +778,13 @@
- 55
+ 68
21
- 55
+ 68
16777215
@@ -966,18 +985,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Up
@@ -1036,18 +1055,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Left
@@ -1085,18 +1104,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Right
@@ -1167,18 +1186,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Down
@@ -1292,18 +1311,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
L
@@ -1341,18 +1360,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
ZL
@@ -1445,18 +1464,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Minus
@@ -1494,18 +1513,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Capture
@@ -1564,18 +1583,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Plus
@@ -1613,18 +1632,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Home
@@ -1717,18 +1736,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
R
@@ -1766,18 +1785,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
ZR
@@ -1870,18 +1889,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
SL
@@ -1919,18 +1938,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
SR
@@ -2027,18 +2046,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Left
@@ -2076,18 +2095,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Right
@@ -2225,18 +2244,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
X
@@ -2295,18 +2314,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Y
@@ -2344,18 +2363,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
A
@@ -2426,18 +2445,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
B
@@ -2580,18 +2599,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Up
@@ -2650,18 +2669,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Left
@@ -2699,18 +2718,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Right
@@ -2781,18 +2800,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Down
@@ -2851,18 +2870,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Pressed
@@ -2900,18 +2919,18 @@
- 57
+ 68
0
- 55
+ 68
16777215
- min-width: 55px;
+ min-width: 68px;
Modifier
@@ -2946,13 +2965,13 @@
- 55
+ 68
21
- 55
+ 68
16777215
diff --git a/src/yuzu/configuration/configure_motion_touch.ui b/src/yuzu/configuration/configure_motion_touch.ui
index 602cf8cd8..5b78c5a4b 100644
--- a/src/yuzu/configuration/configure_motion_touch.ui
+++ b/src/yuzu/configuration/configure_motion_touch.ui
@@ -312,16 +312,6 @@
accepted()
ConfigureMotionTouch
ApplyConfiguration()
-
-
- 220
- 380
-
-
- 220
- 200
-
-
diff --git a/src/yuzu/configuration/configure_mouse_advanced.ui b/src/yuzu/configuration/configure_mouse_advanced.ui
index 74552fdbd..5b99e1c37 100644
--- a/src/yuzu/configuration/configure_mouse_advanced.ui
+++ b/src/yuzu/configuration/configure_mouse_advanced.ui
@@ -15,7 +15,7 @@
QPushButton {
- min-width: 55px;
+ min-width: 60px;
}
@@ -42,13 +42,13 @@
- 57
+ 68
0
- 16777215
+ 68
16777215
@@ -82,7 +82,7 @@
- 57
+ 68
0
@@ -110,7 +110,7 @@
- 57
+ 68
0
@@ -138,13 +138,13 @@
- 57
+ 68
0
- 16777215
+ 68
16777215
@@ -204,13 +204,13 @@
- 57
+ 68
0
- 16777215
+ 68
16777215
@@ -256,13 +256,13 @@
- 57
+ 68
0
- 16777215
+ 68
16777215
@@ -275,13 +275,13 @@
- 57
+ 68
0
- 16777215
+ 68
16777215
@@ -324,32 +324,12 @@
accepted()
ConfigureMouseAdvanced
accept()
-
-
- 124
- 266
-
-
- 124
- 143
-
-
buttonBox
rejected()
ConfigureMouseAdvanced
reject()
-
-
- 124
- 266
-
-
- 124
- 143
-
-
diff --git a/src/yuzu/configuration/configure_per_game.ui b/src/yuzu/configuration/configure_per_game.ui
index d2057c4ab..25975b3b9 100644
--- a/src/yuzu/configuration/configure_per_game.ui
+++ b/src/yuzu/configuration/configure_per_game.ui
@@ -319,32 +319,12 @@
accepted()
ConfigurePerGame
accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
buttonBox
rejected()
ConfigurePerGame
reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
diff --git a/src/yuzu/configuration/configure_touch_from_button.ui b/src/yuzu/configuration/configure_touch_from_button.ui
index f581e27e0..757219d54 100644
--- a/src/yuzu/configuration/configure_touch_from_button.ui
+++ b/src/yuzu/configuration/configure_touch_from_button.ui
@@ -216,16 +216,6 @@ Drag points to change position, or double-click table cells to edit values.rejected()
ConfigureTouchFromButton
reject()
-
-
- 249
- 428
-
-
- 249
- 224
-
-
diff --git a/src/yuzu/configuration/configure_touchscreen_advanced.ui b/src/yuzu/configuration/configure_touchscreen_advanced.ui
index 1171c2dd1..30ceccddb 100644
--- a/src/yuzu/configuration/configure_touchscreen_advanced.ui
+++ b/src/yuzu/configuration/configure_touchscreen_advanced.ui
@@ -168,32 +168,12 @@
accepted()
ConfigureTouchscreenAdvanced
accept()
-
-
- 140
- 318
-
-
- 140
- 169
-
-
buttonBox
rejected()
ConfigureTouchscreenAdvanced
reject()
-
-
- 140
- 318
-
-
- 140
- 169
-
-
-
+