Compiz

Merge lp:~ivenvd/compiz/compiz.fix_1082152 into lp:compiz/0.9.9

  1. compiz.fix_1082152
  2. Merge into 0.9.9
Proposed by Iven Hsu
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3480
Merged at revision: 3483
Proposed branch: lp:~ivenvd/compiz/compiz.fix_1082152
Merge into: lp:compiz/0.9.9
Diff against target: 34 lines (+13/-0)
2 files modified
kde/window-decorator-kde4/window.cpp (+11/-0)
kde/window-decorator-kde4/window.h (+2/-0)
To merge this branch: bzr merge lp:~ivenvd/compiz/compiz.fix_1082152
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+135825@code.launchpad.net

Commit message

The new added APIs are related to Appmenu
(https://gitorious.org/kde-workspace-appmenu), since KDE 4.10 it's merged to
mainline. I'm not familiar with the code and cannot get it usable but only
compilable now. (LP: #1082152)

Description of the change

The new added APIs are related to Appmenu(https://gitorious.org/kde-workspace-appmenu), since KDE 4.10 it's merged to mainline. I'm not familiar with the code and cannot get it usable but only compilable now.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'kde/window-decorator-kde4/window.cpp'
2--- kde/window-decorator-kde4/window.cpp 2012-11-14 10:17:09 +0000
3+++ kde/window-decorator-kde4/window.cpp 2012-11-23 06:43:18 +0000
4@@ -554,6 +554,17 @@
5 showWindowMenu (pos.bottomLeft ());
6 }
7
8+void
9+KWD::Window::showApplicationMenu (const QPoint &p)
10+{
11+}
12+
13+bool
14+KWD::Window::menuAvailable () const
15+{
16+ return false;
17+}
18+
19 KWD::Options::MouseCommand
20 KWD::Window::buttonToCommand (Qt::MouseButtons button)
21 {
22
23=== modified file 'kde/window-decorator-kde4/window.h'
24--- kde/window-decorator-kde4/window.h 2012-09-03 07:19:30 +0000
25+++ kde/window-decorator-kde4/window.h 2012-11-23 06:43:18 +0000
26@@ -92,6 +92,8 @@
27 virtual void showWindowMenu (const QRect &);
28 virtual void showWindowMenu (const QPoint &);
29 virtual void showWindowMenu (const QPoint &, long int id);
30+ virtual void showApplicationMenu (const QPoint &);
31+ virtual bool menuAvailable () const;
32 virtual void performWindowOperation (WindowOperation);
33 virtual void setMask (const QRegion &, int);
34 virtual bool isPreview (void) const;

Subscribers

People subscribed via source and target branches