diff options
author | bunnei <bunneidev@gmail.com> | 2021-04-26 23:40:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-26 23:40:37 +0200 |
commit | dec5680934b814370326ebd826fa7970d2411bc7 (patch) | |
tree | 8a3a59df5c16f1ea0b7dc943a2c044486f01ceb4 /dist | |
parent | Merge pull request #6198 from Kewlan/favorite-games (diff) | |
parent | applets/swkbd: Fix software keyboard button hint scaling (diff) | |
download | yuzu-dec5680934b814370326ebd826fa7970d2411bc7.tar yuzu-dec5680934b814370326ebd826fa7970d2411bc7.tar.gz yuzu-dec5680934b814370326ebd826fa7970d2411bc7.tar.bz2 yuzu-dec5680934b814370326ebd826fa7970d2411bc7.tar.lz yuzu-dec5680934b814370326ebd826fa7970d2411bc7.tar.xz yuzu-dec5680934b814370326ebd826fa7970d2411bc7.tar.zst yuzu-dec5680934b814370326ebd826fa7970d2411bc7.zip |
Diffstat (limited to 'dist')
17 files changed, 39 insertions, 69 deletions
diff --git a/dist/icons/overlay/osk_button_B.png b/dist/icons/overlay/osk_button_B.png Binary files differindex f4a041178..2664b5923 100644 --- a/dist/icons/overlay/osk_button_B.png +++ b/dist/icons/overlay/osk_button_B.png diff --git a/dist/icons/overlay/osk_button_B_dark.png b/dist/icons/overlay/osk_button_B_dark.png Binary files differindex 2d2bffcca..1bd374571 100644 --- a/dist/icons/overlay/osk_button_B_dark.png +++ b/dist/icons/overlay/osk_button_B_dark.png diff --git a/dist/icons/overlay/osk_button_B_dark_disabled.png b/dist/icons/overlay/osk_button_B_dark_disabled.png Binary files differindex 93c102b1b..3b88e393c 100644 --- a/dist/icons/overlay/osk_button_B_dark_disabled.png +++ b/dist/icons/overlay/osk_button_B_dark_disabled.png diff --git a/dist/icons/overlay/osk_button_B_disabled.png b/dist/icons/overlay/osk_button_B_disabled.png Binary files differindex 5900982f6..0f35cd8f2 100644 --- a/dist/icons/overlay/osk_button_B_disabled.png +++ b/dist/icons/overlay/osk_button_B_disabled.png diff --git a/dist/icons/overlay/osk_button_Y.png b/dist/icons/overlay/osk_button_Y.png Binary files differindex b08b4e26b..2cd193481 100644 --- a/dist/icons/overlay/osk_button_Y.png +++ b/dist/icons/overlay/osk_button_Y.png diff --git a/dist/icons/overlay/osk_button_Y_dark.png b/dist/icons/overlay/osk_button_Y_dark.png Binary files differindex 1fba9ca93..0cce567d3 100644 --- a/dist/icons/overlay/osk_button_Y_dark.png +++ b/dist/icons/overlay/osk_button_Y_dark.png diff --git a/dist/icons/overlay/osk_button_Y_dark_disabled.png b/dist/icons/overlay/osk_button_Y_dark_disabled.png Binary files differindex 6ce53f9e4..de619efa3 100644 --- a/dist/icons/overlay/osk_button_Y_dark_disabled.png +++ b/dist/icons/overlay/osk_button_Y_dark_disabled.png diff --git a/dist/icons/overlay/osk_button_Y_disabled.png b/dist/icons/overlay/osk_button_Y_disabled.png Binary files differindex 25db07f66..8d607bc12 100644 --- a/dist/icons/overlay/osk_button_Y_disabled.png +++ b/dist/icons/overlay/osk_button_Y_disabled.png diff --git a/dist/icons/overlay/osk_button_plus.png b/dist/icons/overlay/osk_button_plus.png Binary files differindex 5baa5201e..9f9787419 100644 --- a/dist/icons/overlay/osk_button_plus.png +++ b/dist/icons/overlay/osk_button_plus.png diff --git a/dist/icons/overlay/osk_button_plus_dark.png b/dist/icons/overlay/osk_button_plus_dark.png Binary files differindex 4cadb438b..dbe7b0c66 100644 --- a/dist/icons/overlay/osk_button_plus_dark.png +++ b/dist/icons/overlay/osk_button_plus_dark.png diff --git a/dist/icons/overlay/osk_button_plus_dark_disabled.png b/dist/icons/overlay/osk_button_plus_dark_disabled.png Binary files differindex b8eb8dc3d..a79af6501 100644 --- a/dist/icons/overlay/osk_button_plus_dark_disabled.png +++ b/dist/icons/overlay/osk_button_plus_dark_disabled.png diff --git a/dist/icons/overlay/osk_button_plus_disabled.png b/dist/icons/overlay/osk_button_plus_disabled.png Binary files differindex c23e9d95d..52ace8eca 100644 --- a/dist/icons/overlay/osk_button_plus_disabled.png +++ b/dist/icons/overlay/osk_button_plus_disabled.png diff --git a/dist/icons/overlay/osk_button_shift_lock_off.png b/dist/icons/overlay/osk_button_shift_lock_off.png Binary files differindex 585500b3a..b506f456f 100644 --- a/dist/icons/overlay/osk_button_shift_lock_off.png +++ b/dist/icons/overlay/osk_button_shift_lock_off.png diff --git a/dist/icons/overlay/osk_button_shift_lock_on.png b/dist/icons/overlay/osk_button_shift_lock_on.png Binary files differindex 09077ab01..eaa4e98ed 100644 --- a/dist/icons/overlay/osk_button_shift_lock_on.png +++ b/dist/icons/overlay/osk_button_shift_lock_on.png 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 { QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { - background-position: right top; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_B.png); + image: url(:/overlay/osk_button_B.png); + image-position: right; 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; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_Y.png); + image: url(:/overlay/osk_button_Y.png); + image-position: right; } QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { - background-position: right top; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_plus.png); + image: url(:/overlay/osk_button_plus.png); + image-position: right; } QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift { - background-position: left top; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_shift_lock_off.png); + image: url(:/overlay/osk_button_shift_lock_off.png); + image-position: left; qproperty-icon: url(:/overlay/osk_button_shift.png); qproperty-iconSize: 36px; } QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { - background-position: left top; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_shift_lock_off.png); + image: url(:/overlay/osk_button_shift_lock_off.png); + image-position: left; 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); } 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 { QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { - background-position: right top; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_B_dark.png); + image: url(:/overlay/osk_button_B_dark.png); + image-position: right; 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; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_Y_dark.png); + image: url(:/overlay/osk_button_Y_dark.png); + image-position: right; } 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; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_plus_dark.png); + image: url(:/overlay/osk_button_plus_dark.png); + image-position: right; } QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift { - background-position: left top; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_shift_lock_off.png); + image: url(:/overlay/osk_button_shift_lock_off.png); + image-position: left; qproperty-icon: url(:/overlay/osk_button_shift_dark.png); qproperty-iconSize: 36px; } QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { - background-position: left top; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_shift_lock_off.png); + image: url(:/overlay/osk_button_shift_lock_off.png); + image-position: left; 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, 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 { QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { - background-position: right top; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_B_dark.png); + image: url(:/overlay/osk_button_B_dark.png); + image-position: right; 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; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_Y_dark.png); + image: url(:/overlay/osk_button_Y_dark.png); + image-position: right; } 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; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_plus_dark.png); + image: url(:/overlay/osk_button_plus_dark.png); + image-position: right; } QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift { - background-position: left top; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_shift_lock_off.png); + image: url(:/overlay/osk_button_shift_lock_off.png); + image-position: left; qproperty-icon: url(:/overlay/osk_button_shift_dark.png); qproperty-iconSize: 36px; } QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { - background-position: left top; - background-repeat: no-repeat; - background-origin: content; - background-image: url(:/overlay/osk_button_shift_lock_off.png); + image: url(:/overlay/osk_button_shift_lock_off.png); + image-position: left; 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); } |