diff options
| author |  Szymon Tomasz Stefanek | 2017-12-28 23:04:35 +0100 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2017-12-28 23:04:35 +0100 |
| commit | d2d559c718ab32149ab6cff33d7ddc3938340788 (patch) | |
| tree | 48a0efdeeece0b378a6573a87de5d52fa4da2a6b /src | |
| parent | Remove --immediate switch from delete (diff) | |
| download | KVIrc-d2d559c718ab32149ab6cff33d7ddc3938340788.tar.gz KVIrc-d2d559c718ab32149ab6cff33d7ddc3938340788.tar.bz2 KVIrc-d2d559c718ab32149ab6cff33d7ddc3938340788.zip | |
Fix #2240
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/dcc/DccDialog.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/modules/dcc/DccDialog.cpp b/src/modules/dcc/DccDialog.cpp index a6d113404..6beb70ad8 100644 --- a/src/modules/dcc/DccDialog.cpp +++ b/src/modules/dcc/DccDialog.cpp @@ -27,6 +27,7 @@ #include "KviLocale.h" #include "KviIconManager.h" #include "KviApplication.h" +#include "KviMainWindow.h" #include <QLayout> #include <QPushButton> @@ -119,8 +120,11 @@ void DccAcceptDialog::closeEvent(QCloseEvent * e) void DccAcceptDialog::showEvent(QShowEvent * e) { - QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen()); - move((rect.width() - width()) / 2, (rect.height() - height()) / 2); + int iScreen = g_pApp->desktop()->screenNumber(g_pMainWindow); + if(iScreen < 0) + iScreen = g_pApp->desktop()->primaryScreen(); + QRect rect = g_pApp->desktop()->screenGeometry(iScreen); + move(rect.x() + ((rect.width() - width()) / 2),rect.y() + ((rect.height() - height()) / 2)); QWidget::showEvent(e); } @@ -182,8 +186,11 @@ void DccRenameDialog::closeEvent(QCloseEvent * e) void DccRenameDialog::showEvent(QShowEvent * e) { - QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen()); - move((rect.width() - width()) / 2, (rect.height() - height()) / 2); + int iScreen = g_pApp->desktop()->screenNumber(g_pMainWindow); + if(iScreen < 0) + iScreen = g_pApp->desktop()->primaryScreen(); + QRect rect = g_pApp->desktop()->screenGeometry(iScreen); + move(rect.x() + ((rect.width() - width()) / 2),rect.y() + ((rect.height() - height()) / 2)); QWidget::showEvent(e); } |