Merge pull request #6236 from Morph1984/swkbd-button-hint-scaling

applets/swkbd: Fix software keyboard button hint scaling

dist/qt_themes/default/style.qss

@@ -515,45 +515,35 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    background-position: right top;
+    image: url(:/overlay/osk_button_B.png);
-    background-repeat: no-repeat;
+    image-position: right;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_B.png);
     qproperty-icon: url(:/overlay/osk_button_backspace.png);
     qproperty-iconSize: 36px;
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    background-position: right top;
+    image: url(:/overlay/osk_button_Y.png);
-    background-repeat: no-repeat;
+    image-position: right;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_Y.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    background-position: right top;
+    image: url(:/overlay/osk_button_plus.png);
-    background-repeat: no-repeat;
+    image-position: right;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_plus.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-    background-position: left top;
+    image: url(:/overlay/osk_button_shift_lock_off.png);
-    background-repeat: no-repeat;
+    image-position: left;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_shift_lock_off.png);
     qproperty-icon: url(:/overlay/osk_button_shift.png);
     qproperty-iconSize: 36px;
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-    background-position: left top;
+    image: url(:/overlay/osk_button_shift_lock_off.png);
-    background-repeat: no-repeat;
+    image-position: left;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_shift_lock_off.png);
     qproperty-icon: url(:/overlay/osk_button_shift_on.png);
     qproperty-iconSize: 36px;
 }
@@ -645,16 +635,16 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-    background-image: url(:/overlay/osk_button_plus_disabled.png);
+    image: url(:/overlay/osk_button_plus_disabled.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    background-image: url(:/overlay/osk_button_B_disabled.png);
+    image: url(:/overlay/osk_button_B_disabled.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-    background-image: url(:/overlay/osk_button_Y_disabled.png);
+    image: url(:/overlay/osk_button_Y_disabled.png);
 }

dist/qt_themes/qdarkstyle/style.qss

@@ -1805,46 +1805,36 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    background-position: right top;
+    image: url(:/overlay/osk_button_B_dark.png);
-    background-repeat: no-repeat;
+    image-position: right;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_B_dark.png);
     qproperty-icon: url(:/overlay/osk_button_backspace_dark.png);
     qproperty-iconSize: 36px;
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    background-position: right top;
+    image: url(:/overlay/osk_button_Y_dark.png);
-    background-repeat: no-repeat;
+    image-position: right;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_Y_dark.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
     color: rgba(44, 44, 44, 1);
-    background-position: right top;
+    image: url(:/overlay/osk_button_plus_dark.png);
-    background-repeat: no-repeat;
+    image-position: right;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_plus_dark.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-    background-position: left top;
+    image: url(:/overlay/osk_button_shift_lock_off.png);
-    background-repeat: no-repeat;
+    image-position: left;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_shift_lock_off.png);
     qproperty-icon: url(:/overlay/osk_button_shift_dark.png);
     qproperty-iconSize: 36px;
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-    background-position: left top;
+    image: url(:/overlay/osk_button_shift_lock_off.png);
-    background-repeat: no-repeat;
+    image-position: left;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_shift_lock_off.png);
     qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png);
     qproperty-iconSize: 36px;
 }
@@ -1936,18 +1926,18 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-    background-image: url(:/overlay/osk_button_plus_dark_disabled.png);
+    image: url(:/overlay/osk_button_plus_dark_disabled.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    background-image: url(:/overlay/osk_button_B_dark_disabled.png);
+    image: url(:/overlay/osk_button_B_dark_disabled.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-    background-image: url(:/overlay/osk_button_Y_dark_disabled.png);
+    image: url(:/overlay/osk_button_Y_dark_disabled.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QFrame,

dist/qt_themes/qdarkstyle_midnight_blue/style.qss

@@ -2740,46 +2740,36 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-  background-position: right top;
+  image: url(:/overlay/osk_button_B_dark.png);
-  background-repeat: no-repeat;
+  image-position: right;
-  background-origin: content;
-  background-image: url(:/overlay/osk_button_B_dark.png);
   qproperty-icon: url(:/overlay/osk_button_backspace_dark.png);
   qproperty-iconSize: 36px;
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-  background-position: right top;
+  image: url(:/overlay/osk_button_Y_dark.png);
-  background-repeat: no-repeat;
+  image-position: right;
-  background-origin: content;
-  background-image: url(:/overlay/osk_button_Y_dark.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
   color: rgba(44, 44, 44, 1);
-  background-position: right top;
+  image: url(:/overlay/osk_button_plus_dark.png);
-  background-repeat: no-repeat;
+  image-position: right;
-  background-origin: content;
-  background-image: url(:/overlay/osk_button_plus_dark.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-  background-position: left top;
+  image: url(:/overlay/osk_button_shift_lock_off.png);
-  background-repeat: no-repeat;
+  image-position: left;
-  background-origin: content;
-  background-image: url(:/overlay/osk_button_shift_lock_off.png);
   qproperty-icon: url(:/overlay/osk_button_shift_dark.png);
   qproperty-iconSize: 36px;
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-  background-position: left top;
+  image: url(:/overlay/osk_button_shift_lock_off.png);
-  background-repeat: no-repeat;
+  image-position: left;
-  background-origin: content;
-  background-image: url(:/overlay/osk_button_shift_lock_off.png);
   qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png);
   qproperty-iconSize: 36px;
 }
@@ -2871,16 +2861,16 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-  background-image: url(:/overlay/osk_button_plus_dark_disabled.png);
+  image: url(:/overlay/osk_button_plus_dark_disabled.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-  background-image: url(:/overlay/osk_button_B_dark_disabled.png);
+  image: url(:/overlay/osk_button_B_dark_disabled.png);
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-  background-image: url(:/overlay/osk_button_Y_dark_disabled.png);
+  image: url(:/overlay/osk_button_Y_dark_disabled.png);
 }

src/yuzu/applets/software_keyboard.cpp

@@ -1027,10 +1027,8 @@ void QtSoftwareKeyboardDialog::ChangeBottomOSKIndex() {
         ui->bottomOSK->setCurrentIndex(static_cast<int>(bottom_osk_index));
 
         ui->button_shift_shift->setStyleSheet(
-            QStringLiteral("background-image: url(:/overlay/osk_button_shift_lock_off.png);"
+            QStringLiteral("image: url(:/overlay/osk_button_shift_lock_off.png);"
-                           "\nbackground-position: left top;"
+                           "\nimage-position: left;"));
-                           "\nbackground-repeat: no-repeat;"
-                           "\nbackground-origin: content;"));
 
         ui->button_shift_shift->setIconSize(ui->button_shift->iconSize());
         ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize());
@@ -1040,10 +1038,8 @@ void QtSoftwareKeyboardDialog::ChangeBottomOSKIndex() {
             caps_lock_enabled = false;
 
             ui->button_shift_shift->setStyleSheet(
-                QStringLiteral("background-image: url(:/overlay/osk_button_shift_lock_off.png);"
+                QStringLiteral("image: url(:/overlay/osk_button_shift_lock_off.png);"
-                               "\nbackground-position: left top;"
+                               "\nimage-position: left;"));
-                               "\nbackground-repeat: no-repeat;"
-                               "\nbackground-origin: content;"));
 
             ui->button_shift_shift->setIconSize(ui->button_shift->iconSize());
             ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize());
@@ -1056,10 +1052,8 @@ void QtSoftwareKeyboardDialog::ChangeBottomOSKIndex() {
             caps_lock_enabled = true;
 
             ui->button_shift_shift->setStyleSheet(
-                QStringLiteral("background-image: url(:/overlay/osk_button_shift_lock_on.png);"
+                QStringLiteral("image: url(:/overlay/osk_button_shift_lock_on.png);"
-                               "\nbackground-position: left top;"
+                               "\nimage-position: left;"));
-                               "\nbackground-repeat: no-repeat;"
-                               "\nbackground-origin: content;"));
 
             ui->button_shift_shift->setIconSize(ui->button_shift->iconSize());
             ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize());