Merge lp:~ivenvd/compiz/compiz.kwd-appmenu-position into lp:compiz/0.9.9

[Iven Hsu]

In the original code, the position of the appmenu is not recalculated based
on the client window geometry. This commit fixes it, and now the menu popups
at the right postion instead of left-top corner.
(LP: #1089863)

[Daniel van Vugt (vanvugt)]

Cool, thanks. Could you create a bug for the problem please?

[Iven Hsu (ivenvd)]

@Daniel Done. :)

[Daniel van Vugt (vanvugt)]

It's KDE so I'm not going to test it. Looks fine and I'll trust you :)

review: Approve

=== modified file 'kde/window-decorator-kde4/window.cpp'
--- kde/window-decorator-kde4/window.cpp	2012-12-04 15:45:55 +0000
+++ kde/window-decorator-kde4/window.cpp	2012-12-13 10:40:26 +0000
@@ -566,7 +566,12 @@
 void
 KWD::Window::showApplicationMenu (const QPoint &p)
 {
-    QList<QVariant> args = QList<QVariant> () << p.x () << p.y () << qulonglong (mClientId);
+    QPoint pnt = mDecor->widget ()->mapFromGlobal (p);
+
+    pnt += QPoint (mGeometry.x () - mBorder.left - mPadding.left,
+		   mGeometry.y () - mBorder.top - mPadding.top);
+
+    QList<QVariant> args = QList<QVariant> () << pnt.x () << pnt.y () << qulonglong (mClientId);
     QDBusMessage method = QDBusMessage::createMethodCall (
 		    KDED_SERVICE, KDED_APPMENU_PATH, KDED_INTERFACE, "showMenu");
     method.setArguments (args);