iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust menu position to take into account Kvantum shadows

Browse Source
This commit is contained in:
Craig Drummond
2017-06-29 18:03:06 +01:00
parent fe7be6bfd9
commit 673a43f2a3
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
widgets/menubutton.cpp
View File

@@ -29,6 +29,7 @@
#include <QEvent>
#include <QApplication>
#include <QDesktopWidget>
#include <QProxyStyle>
MenuButton::MenuButton(QWidget *parent)
: ToolButton(parent)
@@ -70,11 +71,24 @@ bool MenuButton::eventFilter(QObject *o, QEvent *e)
{
if (QEvent::Show==e->type()) {
if (qobject_cast<QMenu *>(o)) {
static int shadowAdjust = -1;
if (-1==shadowAdjust) {
// Kvantum style adds its own shadows, which makes the menu appear in the wrong place.
// However, Kvatum sill set a property on the style object to indicate the size of
// the shadows. Use this to adjust positioning.
QProxyStyle *proxy=qobject_cast<QProxyStyle *>(style());
QStyle *check=proxy && proxy->baseStyle() ? proxy->baseStyle() : style();
QList<int> shadows = check ? check->property("menu_shadow").value<QList<int> >() : QList<int>();
shadowAdjust = 4 == shadows.length() ? shadows.at(2) : 0;
if (shadowAdjust<0 || shadowAdjust>18) {
shadowAdjust = 0;
}
}
QMenu *mnu=static_cast<QMenu *>(o);
QPoint p=parentWidget()->mapToGlobal(pos());
int newPos=isRightToLeft()
? p.x()
: ((p.x()+width())-mnu->width());
: ((p.x()+width()+shadowAdjust)-mnu->width());
if (newPos<0) {
newPos=0;