alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

better positioning

Browse Source
This commit is contained in:
Marco Martin 2011-10-28 20:14:38 +02:00
parent 4970198392
commit 5c9fec3d31
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
declarativeimports/plasmacomponents/qmenu.cpp
View File

@ -20,6 +20,8 @@
#include "qmenu.h" #include "qmenu.h"
#include <QApplication> #include <QApplication>
#include <QDebug>
#include <QDesktopWidget>
#include <QGraphicsObject> #include <QGraphicsObject>
#include <QGraphicsView> #include <QGraphicsView>
@ -70,6 +72,13 @@ void QMenuProxy::showMenu(int x, int y)
void QMenuProxy::open() void QMenuProxy::open()
{ {
m_menu->clear();
foreach(QMenuItem* item, m_items) {
m_menu->addAction (item);
}
m_menu->updateGeometry();
QGraphicsObject *parentItem = qobject_cast<QGraphicsObject *>(parent()); QGraphicsObject *parentItem = qobject_cast<QGraphicsObject *>(parent());
if (!parentItem || !parentItem->scene()) { if (!parentItem || !parentItem->scene()) {
@ -108,8 +117,16 @@ void QMenuProxy::open()
return; return;
} }
QPoint viewPos = view->mapFromScene(parentItem->scenePos()); const QRect avail = QApplication::desktop()->availableGeometry(view);
showMenu(viewPos.x(), viewPos.y()); QPoint menuPos = view->mapToGlobal(view->mapFromScene(parentItem->scenePos()+QPoint(0, parentItem->boundingRect().height())));
if (menuPos.y() + m_menu->height() > avail.bottom()) {
menuPos = view->mapToGlobal(view->mapFromScene(parentItem->scenePos() - QPoint(0, m_menu->height())));
}
m_menu->popup(menuPos);
m_status = DialogStatus::Open;
emit statusChanged();
} }
void QMenuProxy::close() void QMenuProxy::close()