mirrors/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2025-01-23 09:42:47 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2226 from ts-korhonen/fix-joystick-dialog

Browse source 
Fix Qt joystick dialog
This commit is contained in:
Miran Grča 2022-03-14 22:40:23 +01:00 • committed by GitHub
commit e962b80dd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/qt/qt_joystickconfiguration.cpp
View file

@ -43,7 +43,7 @@ JoystickConfiguration::JoystickConfiguration(int type, int joystick_nr, QWidget
} }
ui->comboBoxDevice->setCurrentIndex(joystick_state[joystick_nr].plat_joystick_nr); ui->comboBoxDevice->setCurrentIndex(joystick_state[joystick_nr].plat_joystick_nr);
setFixedSize(minimumSizeHint()); layout()->setSizeConstraint(QLayout::SetFixedSize);
} }
JoystickConfiguration::~JoystickConfiguration() JoystickConfiguration::~JoystickConfiguration()
@ -197,6 +197,4 @@ void JoystickConfiguration::on_comboBoxDevice_currentIndexChanged(int index) {
++row; ++row;
} }
setFixedSize(minimumSizeHint());
} }

2
src/qt/qt_joystickconfiguration.ui
View file

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Joystick configuration</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">