yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

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

applets/swkbd: Fix software keyboard button hint scaling
This commit is contained in:
bunnei 2021-04-26 14:40:37 -07:00 committed by GitHub
parent 7412f314e4 c413cafdac
commit dec5680934
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 45 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/icons/overlay/osk_button_B.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 741 B

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
dist/icons/overlay/osk_button_B_dark.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 767 B

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
dist/icons/overlay/osk_button_B_dark_disabled.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 781 B

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
dist/icons/overlay/osk_button_B_disabled.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 791 B

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
dist/icons/overlay/osk_button_Y.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
dist/icons/overlay/osk_button_Y_dark.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
dist/icons/overlay/osk_button_Y_dark_disabled.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 694 B

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
dist/icons/overlay/osk_button_Y_disabled.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 699 B

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
dist/icons/overlay/osk_button_plus.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 626 B

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
dist/icons/overlay/osk_button_plus_dark.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 676 B

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
dist/icons/overlay/osk_button_plus_dark_disabled.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 645 B

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
dist/icons/overlay/osk_button_plus_disabled.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
dist/icons/overlay/osk_button_shift_lock_off.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 281 B

After

Width:  |  Height:  |  Size: 936 B

BIN
dist/icons/overlay/osk_button_shift_lock_on.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 274 B

After

Width:  |  Height:  |  Size: 894 B

36
dist/qt_themes/default/style.qss vendored
View File

@ -515,45 +515,35 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { 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-icon: url(:/overlay/osk_button_backspace.png);
qproperty-iconSize: 36px; qproperty-iconSize: 36px;
} }
QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { 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,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { 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 { 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-icon: url(:/overlay/osk_button_shift.png);
qproperty-iconSize: 36px; qproperty-iconSize: 36px;
} }
QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { 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-icon: url(:/overlay/osk_button_shift_on.png);
qproperty-iconSize: 36px; qproperty-iconSize: 36px;
} }
@ -645,16 +635,16 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num: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:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num: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:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift: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);
} }

36
dist/qt_themes/qdarkstyle/style.qss vendored
View File

@ -1805,46 +1805,36 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { 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-icon: url(:/overlay/osk_button_backspace_dark.png);
qproperty-iconSize: 36px; qproperty-iconSize: 36px;
} }
QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { 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,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
color: rgba(44, 44, 44, 1); 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 { 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-icon: url(:/overlay/osk_button_shift_dark.png);
qproperty-iconSize: 36px; qproperty-iconSize: 36px;
} }
QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { 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-icon: url(:/overlay/osk_button_shift_on_dark.png);
qproperty-iconSize: 36px; qproperty-iconSize: 36px;
} }
@ -1936,18 +1926,18 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num: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:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num: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:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift: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, QDialog#QtSoftwareKeyboardDialog QFrame,

36
dist/qt_themes/qdarkstyle_midnight_blue/style.qss vendored
View File

@ -2740,46 +2740,36 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { 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-icon: url(:/overlay/osk_button_backspace_dark.png);
qproperty-iconSize: 36px; qproperty-iconSize: 36px;
} }
QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { 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,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
color: rgba(44, 44, 44, 1); 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 { 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-icon: url(:/overlay/osk_button_shift_dark.png);
qproperty-iconSize: 36px; qproperty-iconSize: 36px;
} }
QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { 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-icon: url(:/overlay/osk_button_shift_on_dark.png);
qproperty-iconSize: 36px; qproperty-iconSize: 36px;
} }
@ -2871,16 +2861,16 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num: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:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num: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:disabled,
QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift: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);
} }

18
src/yuzu/applets/software_keyboard.cpp
View File

@ -1027,10 +1027,8 @@ void QtSoftwareKeyboardDialog::ChangeBottomOSKIndex() {
ui->bottomOSK->setCurrentIndex(static_cast<int>(bottom_osk_index)); ui->bottomOSK->setCurrentIndex(static_cast<int>(bottom_osk_index));
ui->button_shift_shift->setStyleSheet( 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_shift_shift->setIconSize(ui->button_shift->iconSize());
ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize()); ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize());
@ -1040,10 +1038,8 @@ void QtSoftwareKeyboardDialog::ChangeBottomOSKIndex() {
caps_lock_enabled = false; caps_lock_enabled = false;
ui->button_shift_shift->setStyleSheet( 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_shift_shift->setIconSize(ui->button_shift->iconSize());
ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize()); ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize());
@ -1056,10 +1052,8 @@ void QtSoftwareKeyboardDialog::ChangeBottomOSKIndex() {
caps_lock_enabled = true; caps_lock_enabled = true;
ui->button_shift_shift->setStyleSheet( 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_shift_shift->setIconSize(ui->button_shift->iconSize());
ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize()); ui->button_backspace_shift->setIconSize(ui->button_backspace->iconSize());