From ad4c35da48286ecf78ebc4eac539a7c70e2a15a1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 9 Jul 2013 11:17:37 +0200 Subject: Consider virtual screen when determining dock widget visibility. Task-number: QTBUG-32260 Change-Id: I8b28e3869a6e3b1ed12a311dfa0100979098fc4b Reviewed-by: Andy Shaw (cherry picked from qtbase/6c37fb70d695df001999c78a27ca50d6d2ac6517) --- src/gui/widgets/qdockwidget.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp index bb585b1..281988c 100644 --- a/src/gui/widgets/qdockwidget.cpp +++ b/src/gui/widgets/qdockwidget.cpp @@ -1409,9 +1409,12 @@ bool QDockWidget::event(QEvent *event) d->toggleViewAction->setChecked(false); emit visibilityChanged(false); break; - case QEvent::Show: + case QEvent::Show: { d->toggleViewAction->setChecked(true); - emit visibilityChanged(geometry().right() >= 0 && geometry().bottom() >= 0); + const QPoint parentTopLeft = isWindow() ? + QApplication::desktop()->availableGeometry(this).topLeft() : QPoint(0, 0); + emit visibilityChanged(geometry().right() >= parentTopLeft.x() && geometry().bottom() >= parentTopLeft.y()); +} break; #endif case QEvent::ApplicationLayoutDirectionChange: -- cgit v0.12