mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 08:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor text and description updates + fixed an issue with Help text box rendering

Browse Source
This commit is contained in:
kalaposfos13 2024-11-27 13:29:12 +01:00
parent 608601d9b7
commit 6047617ed8
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt_gui/kbm_config_dialog.cpp
View File

@ -27,7 +27,7 @@ HelpDialog* helpDialog;
EditorDialog::EditorDialog(QWidget* parent) : QDialog(parent) { EditorDialog::EditorDialog(QWidget* parent) : QDialog(parent) {
setWindowTitle("Edit Config File"); setWindowTitle("Edit Keyboard + Mouse and Controller input bindings");
resize(600, 400); resize(600, 400);
// Create the editor widget // Create the editor widget

1
src/qt_gui/kbm_help_dialog.cpp
View File

@ -92,6 +92,7 @@ HelpDialog::HelpDialog(bool* open_flag, QWidget* parent) : QDialog(parent) {
// Scroll area wrapping the container // Scroll area wrapping the container
QScrollArea* scrollArea = new QScrollArea; QScrollArea* scrollArea = new QScrollArea;
scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
scrollArea->setWidgetResizable(true); scrollArea->setWidgetResizable(true);
scrollArea->setWidget(containerWidget); scrollArea->setWidget(containerWidget);

6
src/qt_gui/kbm_help_dialog.h
View File

@ -26,7 +26,7 @@ private:
void updateContentHeight() { void updateContentHeight() {
int contentHeight = contentBrowser->document()->size().height(); int contentHeight = contentBrowser->document()->size().height();
contentBrowser->setMinimumHeight(contentHeight + 5); 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. 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? 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 <input> to <output>, but your code doesn't support <input>! Q: I want to bind <input> to <output>, but your code doesn't support <input>!
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() { QString syntax() {