From f4bc1825c943ff0c8130a49fe774d255fa5f86ab Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Date: Thu, 21 Mar 2013 18:19:53 +0100
Subject: [PATCH] Menu: Add support for multiple screens
Change-Id: Ied5a913c220335ea51d6e785d870d340d634d790
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
---
src/controls/qtmenupopupwindow.cpp | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/controls/qtmenupopupwindow.cpp b/src/controls/qtmenupopupwindow.cpp
index 3a7ad7371..a3f76aa0b 100644
--- a/src/controls/qtmenupopupwindow.cpp
+++ b/src/controls/qtmenupopupwindow.cpp
@@ -140,23 +140,26 @@ void QtMenuPopupWindow::setParentWindow(QQuickWindow *parentWindow)
void QtMenuPopupWindow::setGeometry(int posx, int posy, int w, int h)
{
- QSize s = screen()->size();
- if (posx + w > s.width()) {
- if (QtMenuPopupWindow *pw = qobject_cast<QtMenuPopupWindow *>(transientParent())) {
+ QWindow *pw = transientParent();
+ if (!pw && m_parentItem )
+ pw = m_parentItem->window();
+ if (!pw)
+ pw = this;
+ QRect g = pw->screen()->availableVirtualGeometry();
+
+ if (posx + w > g.right()) {
+ if (qobject_cast<QtMenuPopupWindow *>(transientParent())) {
// reposition submenu window on the parent menu's left side
int submenuOverlap = pw->x() + pw->width() - posx;
posx -= pw->width() + w - 2 * submenuOverlap;
} else {
- posx = s.width() - w;
+ posx = g.right() - w;
}
- } else if (posx < 0) {
- posx = 0;
+ } else {
+ posx = qMax(posx, g.left());
}
- if (posy + h > s.height())
- posy = s.height() - h;
- else if (posy < 0)
- posy = 0;
+ posy = qBound(g.top(), posy, g.bottom() - h);
QQuickWindow::setGeometry(posx, posy, w, h);
}
--
GitLab