1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consider virtual screen when determining dock widget visibility.

Browse Source 
Task-number: QTBUG-32260

Change-Id: I8b28e3869a6e3b1ed12a311dfa0100979098fc4b
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
This commit is contained in:
Friedemann Kleint 2013-07-09 11:17:37 +02:00 committed by The Qt Project
parent e602003f87
commit 6c37fb70d6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/widgets/widgets/qdockwidget.cpp
View File

@ -49,6 +49,7 @@
#include <qevent.h> #include <qevent.h>
#include <qfontmetrics.h> #include <qfontmetrics.h>
#include <qwindow.h> #include <qwindow.h>
#include <qscreen.h>
#include <qmainwindow.h> #include <qmainwindow.h>
#include <qrubberband.h> #include <qrubberband.h>
#include <qstylepainter.h> #include <qstylepainter.h>
@ -1387,9 +1388,17 @@ bool QDockWidget::event(QEvent *event)
d->toggleViewAction->setChecked(false); d->toggleViewAction->setChecked(false);
emit visibilityChanged(false); emit visibilityChanged(false);
break; break;
case QEvent::Show: case QEvent::Show: {
d->toggleViewAction->setChecked(true); d->toggleViewAction->setChecked(true);
emit visibilityChanged(geometry().right() >= 0 && geometry().bottom() >= 0); QPoint parentTopLeft(0, 0);
if (isWindow()) {
if (const QWindow *window = windowHandle())
parentTopLeft = window->screen()->availableVirtualGeometry().topLeft();
else
parentTopLeft = QGuiApplication::primaryScreen()->availableVirtualGeometry().topLeft();
}
emit visibilityChanged(geometry().right() >= parentTopLeft.x() && geometry().bottom() >= parentTopLeft.y());
}
break; break;
#endif #endif
case QEvent::ApplicationLayoutDirectionChange: case QEvent::ApplicationLayoutDirectionChange: