Ensure that the options window will always be placed onscreen. Closes #1226.

This commit is contained in:
sledgehammer999 2014-01-02 21:09:45 +02:00
commit 4158465109

View file

@ -266,8 +266,8 @@ options_imp::options_imp(QWidget *parent):
connect(advancedSettings, SIGNAL(settingsChanged()), this, SLOT(enableApplyButton())); connect(advancedSettings, SIGNAL(settingsChanged()), this, SLOT(enableApplyButton()));
// Adapt size // Adapt size
show();
loadWindowState(); loadWindowState();
show();
} }
void options_imp::initializeLanguageCombo() void options_imp::initializeLanguageCombo()
@ -304,7 +304,8 @@ void options_imp::loadWindowState() {
QIniSettings settings; QIniSettings settings;
resize(settings.value(QString::fromUtf8("Preferences/State/size"), sizeFittingScreen()).toSize()); resize(settings.value(QString::fromUtf8("Preferences/State/size"), sizeFittingScreen()).toSize());
QPoint p = settings.value(QString::fromUtf8("Preferences/State/pos"), QPoint()).toPoint(); QPoint p = settings.value(QString::fromUtf8("Preferences/State/pos"), QPoint()).toPoint();
if (!p.isNull()) QRect scr_rect = qApp->desktop()->screenGeometry();
if (!p.isNull() && scr_rect.contains(p))
move(p); move(p);
// Load slider size // Load slider size
const QStringList sizes_str = settings.value("Preferences/State/hSplitterSizes", QStringList()).toStringList(); const QStringList sizes_str = settings.value("Preferences/State/hSplitterSizes", QStringList()).toStringList();