github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-14 17:23:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix optionsdlg position

Browse source
This commit is contained in:
Chocobo1 2015-10-27 11:39:33 +08:00
parent 46abe42a54
commit 933f9f1451
4 changed files with 5 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/gui/optionsdlg.cpp
View file

@ -357,7 +357,6 @@ OptionsDialog::OptionsDialog(QWidget *parent)
m_ui->advPageLayout->addWidget(advancedSettings);
connect(advancedSettings, SIGNAL(settingsChanged()), this, SLOT(enableApplyButton()));
// Adapt size
show();
loadWindowState();
}
@ -404,14 +403,9 @@ void OptionsDialog::changePage(QListWidgetItem *current, QListWidgetItem *previo
void OptionsDialog::loadWindowState()
{
const Preferences* const pref = Preferences::instance();
resize(pref->getPrefSize(sizeFittingScreen()));
QPoint p = pref->getPrefPos();
QRect scr_rect = qApp->desktop()->screenGeometry();
if (!p.isNull() && scr_rect.contains(p))
move(p);
// Load slider size
resize(pref->getPrefSize(this->size()));
const QStringList sizes_str = pref->getPrefHSplitterSizes();
// Splitter size
QList<int> sizes;
if (sizes_str.size() == 2) {
sizes << sizes_str.first().toInt();
@ -427,8 +421,10 @@ void OptionsDialog::loadWindowState()
void OptionsDialog::saveWindowState() const
{
Preferences* const pref = Preferences::instance();
// window size
pref->setPrefSize(size());
pref->setPrefPos(pos());
// Splitter size
QStringList sizes_str;
sizes_str << QString::number(m_ui->hsplitter->sizes().first());
@ -436,25 +432,6 @@ void OptionsDialog::saveWindowState() const
pref->setPrefHSplitterSizes(sizes_str);
}
QSize OptionsDialog::sizeFittingScreen() const
{
int scrn = 0;
QWidget *w = this->topLevelWidget();
if (w)
scrn = QApplication::desktop()->screenNumber(w);
else if (QApplication::desktop()->isVirtualDesktop())
scrn = QApplication::desktop()->screenNumber(QCursor::pos());
else
scrn = QApplication::desktop()->screenNumber(this);
QRect desk(QApplication::desktop()->availableGeometry(scrn));
if (width() > desk.width() || height() > desk.height())
if (desk.width() > 0 && desk.height() > 0)
return QSize(desk.width(), desk.height());
return size();
}
void OptionsDialog::saveOptions()
{
applyButton->setEnabled(false);