summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-08-26 04:34:37 +0200
committerPetr Mrázek <peterix@gmail.com>2013-08-26 04:34:37 +0200
commit6793f6b706e2127bc8fb2a8fc037f19309b8f806 (patch)
tree20c6ca6b0b4eb2fa791fca74d70dcd6efc2d4d4f /gui
parent767c3db29747d58bfe2881fae9a6b1aa8e05d301 (diff)
downloadMultiMC-6793f6b706e2127bc8fb2a8fc037f19309b8f806.tar
MultiMC-6793f6b706e2127bc8fb2a8fc037f19309b8f806.tar.gz
MultiMC-6793f6b706e2127bc8fb2a8fc037f19309b8f806.tar.lz
MultiMC-6793f6b706e2127bc8fb2a8fc037f19309b8f806.tar.xz
MultiMC-6793f6b706e2127bc8fb2a8fc037f19309b8f806.zip
Make settings dialog layouts less derpy on windows
Diffstat (limited to 'gui')
-rw-r--r--gui/instancesettings.cpp6
-rw-r--r--gui/instancesettings.h3
-rw-r--r--gui/settingsdialog.cpp5
-rw-r--r--gui/settingsdialog.h3
4 files changed, 16 insertions, 1 deletions
diff --git a/gui/instancesettings.cpp b/gui/instancesettings.cpp
index 8a973665..dfb04f3d 100644
--- a/gui/instancesettings.cpp
+++ b/gui/instancesettings.cpp
@@ -34,6 +34,12 @@ InstanceSettings::~InstanceSettings()
delete ui;
}
+void InstanceSettings::showEvent ( QShowEvent* ev )
+{
+ QDialog::showEvent(ev);
+ adjustSize();
+}
+
void InstanceSettings::on_customCommandsGroupBox_toggled(bool state)
{
ui->labelCustomCmdsDescription->setEnabled(state);
diff --git a/gui/instancesettings.h b/gui/instancesettings.h
index afbd0c16..b6cdb92c 100644
--- a/gui/instancesettings.h
+++ b/gui/instancesettings.h
@@ -20,7 +20,8 @@ public:
void applySettings();
void loadSettings();
-
+protected:
+ virtual void showEvent ( QShowEvent* );
private slots:
void on_customCommandsGroupBox_toggled(bool arg1);
void on_buttonBox_accepted();
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index f3aa7316..909706b6 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -35,6 +35,11 @@ SettingsDialog::~SettingsDialog()
{
delete ui;
}
+void SettingsDialog::showEvent ( QShowEvent* ev )
+{
+ QDialog::showEvent(ev);
+ adjustSize();
+}
void SettingsDialog::updateCheckboxStuff()
{
diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h
index 815aa11d..b0a8c673 100644
--- a/gui/settingsdialog.h
+++ b/gui/settingsdialog.h
@@ -36,6 +36,9 @@ public:
void applySettings(SettingsObject *s);
void loadSettings(SettingsObject* s);
+
+protected:
+ virtual void showEvent ( QShowEvent* );
private slots:
void on_instDirBrowseBtn_clicked();