Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix popupmenu position error

Browse Source 
Change-Id: I39b2a9c792fff40c326785c8aa833ebf730639ef
This commit is contained in:
石博文 2016-06-23 19:32:53 +08:00 committed by Hualet Wang
parent f8233ed0eb
commit a73854f66c
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frame/item/dockitem.cpp
View File

@ -46,7 +46,7 @@ void DockItem::mousePressEvent(QMouseEvent *e)
const QRect DockItem::perfectIconRect() const const QRect DockItem::perfectIconRect() const
{ {
const QRect itemRect = rect(); const QRect itemRect = rect();
const int iconSize = std::min(itemRect.width(), itemRect.height()); const int iconSize = std::min(itemRect.width(), itemRect.height()) * 0.8;
QRect iconRect; QRect iconRect;
iconRect.setWidth(iconSize); iconRect.setWidth(iconSize);
@ -71,9 +71,24 @@ void DockItem::showContextMenu()
return; return;
} }
const QPoint p = mapToGlobal(pos()); QPoint p;
QWidget *w = this;
do {
p += w->pos();
w = qobject_cast<QWidget *>(w->parent());
} while (w);
const QRect r = rect();
switch (DockPosition)
{
case Top: p += QPoint(r.width() / 2, r.height()); break;
case Bottom: p += QPoint(r.width() / 2, 0); break;
case Left: p += QPoint(r.width(), r.height() / 2); break;
case Right: p += QPoint(0, r.height() / 2); break;
}
QJsonObject menuObject; QJsonObject menuObject;
menuObject.insert("x", QJsonValue(p.x() + width() / 2)); menuObject.insert("x", QJsonValue(p.x()));
menuObject.insert("y", QJsonValue(p.y())); menuObject.insert("y", QJsonValue(p.y()));
menuObject.insert("isDockMenu", QJsonValue(true)); menuObject.insert("isDockMenu", QJsonValue(true));
menuObject.insert("menuJsonContent", QJsonValue(menuJson)); menuObject.insert("menuJsonContent", QJsonValue(menuJson));