diff options
| author | 2021-04-26 14:40:37 -0700 | |
|---|---|---|
| committer | 2021-04-26 14:40:37 -0700 | |
| commit | dec5680934b814370326ebd826fa7970d2411bc7 (patch) | |
| tree | 8a3a59df5c16f1ea0b7dc943a2c044486f01ceb4 | |
| parent | Merge pull request #6198 from Kewlan/favorite-games (diff) | |
| parent | applets/swkbd: Fix software keyboard button hint scaling (diff) | |
| download | yuzu-dec5680934b814370326ebd826fa7970d2411bc7.tar.gz yuzu-dec5680934b814370326ebd826fa7970d2411bc7.tar.xz yuzu-dec5680934b814370326ebd826fa7970d2411bc7.zip | |
Merge pull request #6236 from Morph1984/swkbd-button-hint-scaling
applets/swkbd: Fix software keyboard button hint scaling
18 files changed, 45 insertions, 81 deletions
diff --git a/dist/icons/overlay/osk_button_B.png b/dist/icons/overlay/osk_button_B.png index f4a041178..2664b5923 100644 --- a/dist/icons/overlay/osk_button_B.png +++ b/dist/icons/overlay/osk_button_B.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_B_dark.png b/dist/icons/overlay/osk_button_B_dark.png index 2d2bffcca..1bd374571 100644 --- a/dist/icons/overlay/osk_button_B_dark.png +++ b/dist/icons/overlay/osk_button_B_dark.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_B_dark_disabled.png b/dist/icons/overlay/osk_button_B_dark_disabled.png index 93c102b1b..3b88e393c 100644 --- a/dist/icons/overlay/osk_button_B_dark_disabled.png +++ b/dist/icons/overlay/osk_button_B_dark_disabled.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_B_disabled.png b/dist/icons/overlay/osk_button_B_disabled.png index 5900982f6..0f35cd8f2 100644 --- a/dist/icons/overlay/osk_button_B_disabled.png +++ b/dist/icons/overlay/osk_button_B_disabled.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_Y.png b/dist/icons/overlay/osk_button_Y.png index b08b4e26b..2cd193481 100644 --- a/dist/icons/overlay/osk_button_Y.png +++ b/dist/icons/overlay/osk_button_Y.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_Y_dark.png b/dist/icons/overlay/osk_button_Y_dark.png index 1fba9ca93..0cce567d3 100644 --- a/dist/icons/overlay/osk_button_Y_dark.png +++ b/dist/icons/overlay/osk_button_Y_dark.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_Y_dark_disabled.png b/dist/icons/overlay/osk_button_Y_dark_disabled.png index 6ce53f9e4..de619efa3 100644 --- a/dist/icons/overlay/osk_button_Y_dark_disabled.png +++ b/dist/icons/overlay/osk_button_Y_dark_disabled.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_Y_disabled.png b/dist/icons/overlay/osk_button_Y_disabled.png index 25db07f66..8d607bc12 100644 --- a/dist/icons/overlay/osk_button_Y_disabled.png +++ b/dist/icons/overlay/osk_button_Y_disabled.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_plus.png b/dist/icons/overlay/osk_button_plus.png index 5baa5201e..9f9787419 100644 --- a/dist/icons/overlay/osk_button_plus.png +++ b/dist/icons/overlay/osk_button_plus.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_plus_dark.png b/dist/icons/overlay/osk_button_plus_dark.png index 4cadb438b..dbe7b0c66 100644 --- a/dist/icons/overlay/osk_button_plus_dark.png +++ b/dist/icons/overlay/osk_button_plus_dark.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_plus_dark_disabled.png b/dist/icons/overlay/osk_button_plus_dark_disabled.png index b8eb8dc3d..a79af6501 100644 --- a/dist/icons/overlay/osk_button_plus_dark_disabled.png +++ b/dist/icons/overlay/osk_button_plus_dark_disabled.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_plus_disabled.png b/dist/icons/overlay/osk_button_plus_disabled.png index c23e9d95d..52ace8eca 100644 --- a/dist/icons/overlay/osk_button_plus_disabled.png +++ b/dist/icons/overlay/osk_button_plus_disabled.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_shift_lock_off.png b/dist/icons/overlay/osk_button_shift_lock_off.png index 585500b3a..b506f456f 100644 --- a/dist/icons/overlay/osk_button_shift_lock_off.png +++ b/dist/icons/overlay/osk_button_shift_lock_off.png | |||
| Binary files differ | |||
diff --git a/dist/icons/overlay/osk_button_shift_lock_on.png b/dist/icons/overlay/osk_button_shift_lock_on.png index 09077ab01..eaa4e98ed 100644 --- a/dist/icons/overlay/osk_button_shift_lock_on.png +++ b/dist/icons/overlay/osk_button_shift_lock_on.png | |||
| Binary files differ | |||
diff --git a/dist/qt_themes/default/style.qss b/dist/qt_themes/default/style.qss index 3bc92b69d..cee219374 100644 --- a/dist/qt_themes/default/style.qss +++ b/dist/qt_themes/default/style.qss | |||
| @@ -515,45 +515,35 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed { | |||
| 515 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, | 515 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, |
| 516 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, | 516 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, |
| 517 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { | 517 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { |
| 518 | background-position: right top; | 518 | image: url(:/overlay/osk_button_B.png); |
| 519 | background-repeat: no-repeat; | 519 | image-position: right; |
| 520 | background-origin: content; | ||
| 521 | background-image: url(:/overlay/osk_button_B.png); | ||
| 522 | qproperty-icon: url(:/overlay/osk_button_backspace.png); | 520 | qproperty-icon: url(:/overlay/osk_button_backspace.png); |
| 523 | qproperty-iconSize: 36px; | 521 | qproperty-iconSize: 36px; |
| 524 | } | 522 | } |
| 525 | 523 | ||
| 526 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, | 524 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, |
| 527 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { | 525 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { |
| 528 | background-position: right top; | 526 | image: url(:/overlay/osk_button_Y.png); |
| 529 | background-repeat: no-repeat; | 527 | image-position: right; |
| 530 | background-origin: content; | ||
| 531 | background-image: url(:/overlay/osk_button_Y.png); | ||
| 532 | } | 528 | } |
| 533 | 529 | ||
| 534 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok, | 530 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok, |
| 535 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, | 531 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, |
| 536 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { | 532 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { |
| 537 | background-position: right top; | 533 | image: url(:/overlay/osk_button_plus.png); |
| 538 | background-repeat: no-repeat; | 534 | image-position: right; |
| 539 | background-origin: content; | ||
| 540 | background-image: url(:/overlay/osk_button_plus.png); | ||
| 541 | } | 535 | } |
| 542 | 536 | ||
| 543 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift { | 537 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift { |
| 544 | background-position: left top; | 538 | image: url(:/overlay/osk_button_shift_lock_off.png); |
| 545 | background-repeat: no-repeat; | 539 | image-position: left; |
| 546 | background-origin: content; | ||
| 547 | background-image: url(:/overlay/osk_button_shift_lock_off.png); | ||
| 548 | qproperty-icon: url(:/overlay/osk_button_shift.png); | 540 | qproperty-icon: url(:/overlay/osk_button_shift.png); |
| 549 | qproperty-iconSize: 36px; | 541 | qproperty-iconSize: 36px; |
| 550 | } | 542 | } |
| 551 | 543 | ||
| 552 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { | 544 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { |
| 553 | background-position: left top; | 545 | image: url(:/overlay/osk_button_shift_lock_off.png); |
| 554 | background-repeat: no-repeat; | 546 | image-position: left; |
| 555 | background-origin: content; | ||
| 556 | background-image: url(:/overlay/osk_button_shift_lock_off.png); | ||
| 557 | qproperty-icon: url(:/overlay/osk_button_shift_on.png); | 547 | qproperty-icon: url(:/overlay/osk_button_shift_on.png); |
| 558 | qproperty-iconSize: 36px; | 548 | qproperty-iconSize: 36px; |
| 559 | } | 549 | } |
| @@ -645,16 +635,16 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled { | |||
| 645 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, | 635 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, |
| 646 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, | 636 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, |
| 647 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled { | 637 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled { |
| 648 | background-image: url(:/overlay/osk_button_plus_disabled.png); | 638 | image: url(:/overlay/osk_button_plus_disabled.png); |
| 649 | } | 639 | } |
| 650 | 640 | ||
| 651 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled, | 641 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled, |
| 652 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, | 642 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, |
| 653 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled { | 643 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled { |
| 654 | background-image: url(:/overlay/osk_button_B_disabled.png); | 644 | image: url(:/overlay/osk_button_B_disabled.png); |
| 655 | } | 645 | } |
| 656 | 646 | ||
| 657 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled, | 647 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled, |
| 658 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled { | 648 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled { |
| 659 | background-image: url(:/overlay/osk_button_Y_disabled.png); | 649 | image: url(:/overlay/osk_button_Y_disabled.png); |
| 660 | } | 650 | } |
diff --git a/dist/qt_themes/qdarkstyle/style.qss b/dist/qt_themes/qdarkstyle/style.qss index 8ce6d75f7..3d0ccbb9e 100644 --- a/dist/qt_themes/qdarkstyle/style.qss +++ b/dist/qt_themes/qdarkstyle/style.qss | |||
| @@ -1805,46 +1805,36 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed { | |||
| 1805 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, | 1805 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, |
| 1806 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, | 1806 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, |
| 1807 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { | 1807 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { |
| 1808 | background-position: right top; | 1808 | image: url(:/overlay/osk_button_B_dark.png); |
| 1809 | background-repeat: no-repeat; | 1809 | image-position: right; |
| 1810 | background-origin: content; | ||
| 1811 | background-image: url(:/overlay/osk_button_B_dark.png); | ||
| 1812 | qproperty-icon: url(:/overlay/osk_button_backspace_dark.png); | 1810 | qproperty-icon: url(:/overlay/osk_button_backspace_dark.png); |
| 1813 | qproperty-iconSize: 36px; | 1811 | qproperty-iconSize: 36px; |
| 1814 | } | 1812 | } |
| 1815 | 1813 | ||
| 1816 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, | 1814 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, |
| 1817 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { | 1815 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { |
| 1818 | background-position: right top; | 1816 | image: url(:/overlay/osk_button_Y_dark.png); |
| 1819 | background-repeat: no-repeat; | 1817 | image-position: right; |
| 1820 | background-origin: content; | ||
| 1821 | background-image: url(:/overlay/osk_button_Y_dark.png); | ||
| 1822 | } | 1818 | } |
| 1823 | 1819 | ||
| 1824 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok, | 1820 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok, |
| 1825 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, | 1821 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, |
| 1826 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { | 1822 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { |
| 1827 | color: rgba(44, 44, 44, 1); | 1823 | color: rgba(44, 44, 44, 1); |
| 1828 | background-position: right top; | 1824 | image: url(:/overlay/osk_button_plus_dark.png); |
| 1829 | background-repeat: no-repeat; | 1825 | image-position: right; |
| 1830 | background-origin: content; | ||
| 1831 | background-image: url(:/overlay/osk_button_plus_dark.png); | ||
| 1832 | } | 1826 | } |
| 1833 | 1827 | ||
| 1834 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift { | 1828 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift { |
| 1835 | background-position: left top; | 1829 | image: url(:/overlay/osk_button_shift_lock_off.png); |
| 1836 | background-repeat: no-repeat; | 1830 | image-position: left; |
| 1837 | background-origin: content; | ||
| 1838 | background-image: url(:/overlay/osk_button_shift_lock_off.png); | ||
| 1839 | qproperty-icon: url(:/overlay/osk_button_shift_dark.png); | 1831 | qproperty-icon: url(:/overlay/osk_button_shift_dark.png); |
| 1840 | qproperty-iconSize: 36px; | 1832 | qproperty-iconSize: 36px; |
| 1841 | } | 1833 | } |
| 1842 | 1834 | ||
| 1843 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { | 1835 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { |
| 1844 | background-position: left top; | 1836 | image: url(:/overlay/osk_button_shift_lock_off.png); |
| 1845 | background-repeat: no-repeat; | 1837 | image-position: left; |
| 1846 | background-origin: content; | ||
| 1847 | background-image: url(:/overlay/osk_button_shift_lock_off.png); | ||
| 1848 | qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png); | 1838 | qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png); |
| 1849 | qproperty-iconSize: 36px; | 1839 | qproperty-iconSize: 36px; |
| 1850 | } | 1840 | } |
| @@ -1936,18 +1926,18 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled { | |||
| 1936 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, | 1926 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, |
| 1937 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, | 1927 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, |
| 1938 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled { | 1928 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled { |
| 1939 | background-image: url(:/overlay/osk_button_plus_dark_disabled.png); | 1929 | image: url(:/overlay/osk_button_plus_dark_disabled.png); |
| 1940 | } | 1930 | } |
| 1941 | 1931 | ||
| 1942 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled, | 1932 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled, |
| 1943 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, | 1933 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, |
| 1944 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled { | 1934 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled { |
| 1945 | background-image: url(:/overlay/osk_button_B_dark_disabled.png); | 1935 | image: url(:/overlay/osk_button_B_dark_disabled.png); |
| 1946 | } | 1936 | } |
| 1947 | 1937 | ||
| 1948 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled, | 1938 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled, |
| 1949 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled { | 1939 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled { |
| 1950 | background-image: url(:/overlay/osk_button_Y_dark_disabled.png); | 1940 | image: url(:/overlay/osk_button_Y_dark_disabled.png); |
| 1951 | } | 1941 | } |
| 1952 | 1942 | ||
| 1953 | QDialog#QtSoftwareKeyboardDialog QFrame, | 1943 | QDialog#QtSoftwareKeyboardDialog QFrame, |
diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss index 64e1ecbcc..51bec2fd7 100644 --- a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss +++ b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss | |||
| @@ -2740,46 +2740,36 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed { | |||
| 2740 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, | 2740 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, |
| 2741 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, | 2741 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, |
| 2742 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { | 2742 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { |
| 2743 | background-position: right top; | 2743 | image: url(:/overlay/osk_button_B_dark.png); |
| 2744 | background-repeat: no-repeat; | 2744 | image-position: right; |
| 2745 | background-origin: content; | ||
| 2746 | background-image: url(:/overlay/osk_button_B_dark.png); | ||
| 2747 | qproperty-icon: url(:/overlay/osk_button_backspace_dark.png); | 2745 | qproperty-icon: url(:/overlay/osk_button_backspace_dark.png); |
| 2748 | qproperty-iconSize: 36px; | 2746 | qproperty-iconSize: 36px; |
| 2749 | } | 2747 | } |
| 2750 | 2748 | ||
| 2751 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, | 2749 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, |
| 2752 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { | 2750 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { |
| 2753 | background-position: right top; | 2751 | image: url(:/overlay/osk_button_Y_dark.png); |
| 2754 | background-repeat: no-repeat; | 2752 | image-position: right; |
| 2755 | background-origin: content; | ||
| 2756 | background-image: url(:/overlay/osk_button_Y_dark.png); | ||
| 2757 | } | 2753 | } |
| 2758 | 2754 | ||
| 2759 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok, | 2755 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok, |
| 2760 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, | 2756 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, |
| 2761 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { | 2757 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { |
| 2762 | color: rgba(44, 44, 44, 1); | 2758 | color: rgba(44, 44, 44, 1); |
| 2763 | background-position: right top; | 2759 | image: url(:/overlay/osk_button_plus_dark.png); |
| 2764 | background-repeat: no-repeat; | 2760 | image-position: right; |
| 2765 | background-origin: content; | ||
| 2766 | background-image: url(:/overlay/osk_button_plus_dark.png); | ||
| 2767 | } | 2761 | } |
| 2768 | 2762 | ||
| 2769 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift { | 2763 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift { |
| 2770 | background-position: left top; | 2764 | image: url(:/overlay/osk_button_shift_lock_off.png); |
| 2771 | background-repeat: no-repeat; | 2765 | image-position: left; |
| 2772 | background-origin: content; | ||
| 2773 | background-image: url(:/overlay/osk_button_shift_lock_off.png); | ||
| 2774 | qproperty-icon: url(:/overlay/osk_button_shift_dark.png); | 2766 | qproperty-icon: url(:/overlay/osk_button_shift_dark.png); |
| 2775 | qproperty-iconSize: 36px; | 2767 | qproperty-iconSize: 36px; |
| 2776 | } | 2768 | } |
| 2777 | 2769 | ||
| 2778 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { | 2770 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { |
| 2779 | background-position: left top; | 2771 | image: url(:/overlay/osk_button_shift_lock_off.png); |
| 2780 | background-repeat: no-repeat; | 2772 | image-position: left; |
| 2781 | background-origin: content; | ||
| 2782 | background-image: url(:/overlay/osk_button_shift_lock_off.png); | ||
| 2783 | qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png); | 2773 | qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png); |
| 2784 | qproperty-iconSize: 36px; | 2774 | qproperty-iconSize: 36px; |
| 2785 | } | 2775 | } |
| @@ -2871,16 +2861,16 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled { | |||
| 2871 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, | 2861 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, |
| 2872 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, | 2862 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, |
| 2873 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled { | 2863 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled { |
| 2874 | background-image: url(:/overlay/osk_button_plus_dark_disabled.png); | 2864 | image: url(:/overlay/osk_button_plus_dark_disabled.png); |
| 2875 | } | 2865 | } |
| 2876 | 2866 | ||
| 2877 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled, | 2867 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled, |
| 2878 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, | 2868 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, |
| 2879 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled { | 2869 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled { |
| 2880 | background-image: url(:/overlay/osk_button_B_dark_disabled.png); | 2870 | image: url(:/overlay/osk_button_B_dark_disabled.png); |
| 2881 | } | 2871 | } |
| 2882 | 2872 | ||
| 2883 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled, | 2873 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled, |
| 2884 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled { | 2874 | QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled { |
| 2885 | background-image: url(:/overlay/osk_button_Y_dark_disabled.png); | 2875 | image: url(:/overlay/osk_button_Y_dark_disabled.png); |
| 2886 | } | 2876 | } |
diff --git a/src/yuzu/applets/software_keyboard.cpp b/src/yuzu/applets/software_keyboard.cpp index fd3368479..653486493 100644 --- a/src/yuzu/applets/software_keyboard.cpp +++ b/src/yuzu/applets/software_keyboard.cpp | |||
| @@ -1027,10 +1027,8 @@ void QtSoftwareKeyboardDialog::ChangeBottomOSKIndex() { | |||
| 1027 | ui->bottomOSK->setCurrentIndex(static_cast<int>(bottom_osk_index)); | 1027 | ui->bottomOSK->setCurrentIndex(static_cast<int>(bottom_osk_index)); |
| 1028 | 1028 | ||
| 1029 | ui->button_shift_shift->setStyleSheet( | 1029 | ui->button_shift_shift->setStyleSheet( |
| 1030 | QStringLiteral("background-image: url(:/overlay/osk_button_shift_lock_off.png);" | 1030 | QStringLiteral("image: url(:/overlay/osk_button_shift_lock_off.png);" |
| 1031 | "\nbackground-position: left top;" | 1031 | "\nimage-position: left;")); |
| 1032 | "\nbackground-repeat: no-repeat;" | ||
| 1033 | "\nbackground-origin: content;")); | ||
| 1034 | 1032 | ||
| 1035 | ui->button_shift_shift->setIconSize(ui->button_shift->iconSize()); | 1033 | ui->button_shift_shift->setIconSize(ui->button_shift->iconSize()); |
| 1036 | ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize()); | 1034 | ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize()); |
| @@ -1040,10 +1038,8 @@ void QtSoftwareKeyboardDialog::ChangeBottomOSKIndex() { | |||
| 1040 | caps_lock_enabled = false; | 1038 | caps_lock_enabled = false; |
| 1041 | 1039 | ||
| 1042 | ui->button_shift_shift->setStyleSheet( | 1040 | ui->button_shift_shift->setStyleSheet( |
| 1043 | QStringLiteral("background-image: url(:/overlay/osk_button_shift_lock_off.png);" | 1041 | QStringLiteral("image: url(:/overlay/osk_button_shift_lock_off.png);" |
| 1044 | "\nbackground-position: left top;" | 1042 | "\nimage-position: left;")); |
| 1045 | "\nbackground-repeat: no-repeat;" | ||
| 1046 | "\nbackground-origin: content;")); | ||
| 1047 | 1043 | ||
| 1048 | ui->button_shift_shift->setIconSize(ui->button_shift->iconSize()); | 1044 | ui->button_shift_shift->setIconSize(ui->button_shift->iconSize()); |
| 1049 | ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize()); | 1045 | ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize()); |
| @@ -1056,10 +1052,8 @@ void QtSoftwareKeyboardDialog::ChangeBottomOSKIndex() { | |||
| 1056 | caps_lock_enabled = true; | 1052 | caps_lock_enabled = true; |
| 1057 | 1053 | ||
| 1058 | ui->button_shift_shift->setStyleSheet( | 1054 | ui->button_shift_shift->setStyleSheet( |
| 1059 | QStringLiteral("background-image: url(:/overlay/osk_button_shift_lock_on.png);" | 1055 | QStringLiteral("image: url(:/overlay/osk_button_shift_lock_on.png);" |
| 1060 | "\nbackground-position: left top;" | 1056 | "\nimage-position: left;")); |
| 1061 | "\nbackground-repeat: no-repeat;" | ||
| 1062 | "\nbackground-origin: content;")); | ||
| 1063 | 1057 | ||
| 1064 | ui->button_shift_shift->setIconSize(ui->button_shift->iconSize()); | 1058 | ui->button_shift_shift->setIconSize(ui->button_shift->iconSize()); |
| 1065 | ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize()); | 1059 | ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize()); |