diff options
| author |  Szymon Tomasz Stefanek | 2011-03-05 03:13:09 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2011-03-05 03:13:09 +0000 |
| commit | ffb2e06d377851d36cf3cbe09b6a2f566bdfc0cb (patch) | |
| tree | 2dd524c74f95787af3fdc64d57a92b7694f8bf96 /src/modules/options | |
| parent | Fix #1103 (diff) | |
| download | KVIrc-ffb2e06d377851d36cf3cbe09b6a2f566bdfc0cb.tar.gz KVIrc-ffb2e06d377851d36cf3cbe09b6a2f566bdfc0cb.tar.bz2 KVIrc-ffb2e06d377851d36cf3cbe09b6a2f566bdfc0cb.zip | |
Fix #1102
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5534 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/options')
| -rw-r--r-- | src/modules/options/OptionsWidgetContainer.cpp | 8 | ||||
| -rw-r--r-- | src/modules/options/dialog.cpp | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp index 53e8e6e87..62cc3d95c 100644 --- a/src/modules/options/OptionsWidgetContainer.cpp +++ b/src/modules/options/OptionsWidgetContainer.cpp @@ -28,6 +28,7 @@ #include "KviLocale.h" #include "KviIconManager.h" #include "KviApplication.h" +#include "KviMainWindow.h" #include "KviTalToolTip.h" #include <QLayout> @@ -136,11 +137,12 @@ void OptionsWidgetContainer::closeEvent(QCloseEvent *e) void OptionsWidgetContainer::showEvent(QShowEvent *e) { - if(parent() == 0) + if(!parent()) { - QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen()); - move((rect.width() - width())/2,(rect.height() - height())/2); + QRect rect = g_pApp->desktop()->screenGeometry(g_pMainWindow); + move(rect.x() + ((rect.width() - width())/2),rect.y() + ((rect.height() - height())/2)); } + QWidget::showEvent(e); m_pCancel->setFocus(); } diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 74e5fe713..94ea8c9bf 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -29,6 +29,7 @@ #include "KviOptions.h" #include "KviLocale.h" #include "KviIconManager.h" +#include "KviMainWindow.h" #include "KviModule.h" #include "KviPointerHashTable.h" #include "KviTalVBox.h" @@ -259,9 +260,8 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup) if(!parent()) { if(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y() < 5) - { KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).setY(5); - } + //setGeometry(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry)); resize(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).width(), KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).height()); @@ -274,15 +274,16 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup) OptionsDialog::~OptionsDialog() { - if(!parent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = QRect(pos().x(),pos().y(), - size().width(),size().height()); + if(!parent()) + KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = QRect(pos().x(),pos().y(),size().width(),size().height()); if(g_pOptionsDialogDict) g_pOptionsDialogDict->remove(m_szGroup); } void OptionsDialog::showEvent(QShowEvent *e) { - QRect r = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen()); + // setup a minimum size and move to the screen the main kvirc window is + QRect r = g_pApp->desktop()->screenGeometry(g_pMainWindow); int w = r.width(); int h = r.height(); @@ -298,7 +299,7 @@ void OptionsDialog::showEvent(QShowEvent *e) if(ww < 770)ww = 770; } - setGeometry((w - ww) / 2,(h - wh) / 2,ww,wh); + setGeometry(r.x() + ((w - ww) / 2),r.y() + ((h - wh) / 2),ww,wh); QWidget::showEvent(e); } |