From 6047617ed8834c6223583a1281a66fb65d494d26 Mon Sep 17 00:00:00 2001 From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:29:12 +0100 Subject: [PATCH] Minor text and description updates + fixed an issue with Help text box rendering --- src/qt_gui/kbm_config_dialog.cpp | 2 +- src/qt_gui/kbm_help_dialog.cpp | 1 + src/qt_gui/kbm_help_dialog.h | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qt_gui/kbm_config_dialog.cpp b/src/qt_gui/kbm_config_dialog.cpp index 61b8a812a..af198f79d 100644 --- a/src/qt_gui/kbm_config_dialog.cpp +++ b/src/qt_gui/kbm_config_dialog.cpp @@ -27,7 +27,7 @@ HelpDialog* helpDialog; EditorDialog::EditorDialog(QWidget* parent) : QDialog(parent) { - setWindowTitle("Edit Config File"); + setWindowTitle("Edit Keyboard + Mouse and Controller input bindings"); resize(600, 400); // Create the editor widget diff --git a/src/qt_gui/kbm_help_dialog.cpp b/src/qt_gui/kbm_help_dialog.cpp index 3381f9c62..44f75f6f8 100644 --- a/src/qt_gui/kbm_help_dialog.cpp +++ b/src/qt_gui/kbm_help_dialog.cpp @@ -92,6 +92,7 @@ HelpDialog::HelpDialog(bool* open_flag, QWidget* parent) : QDialog(parent) { // Scroll area wrapping the container QScrollArea* scrollArea = new QScrollArea; + scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); scrollArea->setWidgetResizable(true); scrollArea->setWidget(containerWidget); diff --git a/src/qt_gui/kbm_help_dialog.h b/src/qt_gui/kbm_help_dialog.h index 8bfbf31dc..52c47ce99 100644 --- a/src/qt_gui/kbm_help_dialog.h +++ b/src/qt_gui/kbm_help_dialog.h @@ -26,7 +26,7 @@ private: void updateContentHeight() { int contentHeight = contentBrowser->document()->size().height(); contentBrowser->setMinimumHeight(contentHeight + 5); - contentBrowser->setMaximumHeight(contentHeight + 5); + contentBrowser->setMaximumHeight(contentHeight + 50); } }; @@ -66,10 +66,10 @@ Q: How do I change between mouse and controller joystick input, and why is it ev A: You can switch between them with F7, and it is required, because mouse input is done with polling, which means mouse movement is checked every frame, and if it didn't move, the code manually sets the emulator's virtual controller to 0 (back to the center), even if other input devices would update it. Q: What happens if I accidentally make a typo in the config? -A: The code recognises the line as wrong, and skip it, so the rest of the file will get parsed, but that line in question will be treated like a comment line. +A: The code recognises the line as wrong, and skip it, so the rest of the file will get parsed, but that line in question will be treated like a comment line. You can find these lines in the log, if you search for 'input_handler'. Q: I want to bind to , but your code doesn't support ! -A: Some keys are intentionally omitted, but if you read the bindings through, and you're sure it is not there and isn't one of the intentionally disabled ones, reach out to me by opening an issue on https://github.com/kalaposfos13/shadPS4 or on Discord (@kalaposfos). +A: Some keys are intentionally omitted, but if you read the bindings through, and you're sure it is not there and isn't one of the intentionally disabled ones, open an issue on https://github.com/shadps4-emu/shadPS4. )"; } QString syntax() {