Merge pull request #2226 from ts-korhonen/fix-joystick-dialog
Fix Qt joystick dialog
This commit is contained in:
@@ -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());
|
|
||||||
}
|
}
|
||||||
|
@@ -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">
|
||||||
|
Reference in New Issue
Block a user