Nux

Merge lp:~azzar1/nux/fix-893670 into lp:nux/2.0

Proposed by Andrea Azzarone
Status: Merged
Merged at revision: 536
Proposed branch: lp:~azzar1/nux/fix-893670
Merge into: lp:nux/2.0
Diff against target: 42 lines (+5/-9)
2 files modified
NuxGraphics/GraphicsDisplayX11.cpp (+0/-8)
NuxGraphics/XInputWindow.cpp (+5/-1)
To merge this branch: bzr merge lp:~azzar1/nux/fix-893670
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+88623@code.launchpad.net

Description of the change

This branch is a partial fix for the bug #893670. It requires also:
- https://code.launchpad.net/~andyrock/compiz-core/scale-left-padding/+merge/88622
- https://code.launchpad.net/~andyrock/unity/scale-left-padding/+merge/88625

But you can test it setting the spacing option in the scale ccsm panel to 100.

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

This branch is a partial fix for the bug #893670.

Revision history for this message
Mirco Müller (macslow) wrote :

Looks fine.

review: Approve
Revision history for this message
Andrea Azzarone (azzar1) wrote :

We're waiting for the the other two branches.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
2--- NuxGraphics/GraphicsDisplayX11.cpp 2012-01-06 18:43:37 +0000
3+++ NuxGraphics/GraphicsDisplayX11.cpp 2012-01-15 23:24:26 +0000
4@@ -1682,12 +1682,6 @@
5 {
6 //nuxDebugMsg("[GraphicsDisplay::ProcessXEvents]: MapNotify event.");
7 m_pEvent->type = NUX_WINDOW_MAP;
8-
9- XSetInputFocus(xevent.xany.display,
10- xevent.xany.window,
11- RevertToParent,
12- CurrentTime);
13-
14 }
15
16 break;
17@@ -2727,5 +2721,3 @@
18 }
19
20 }
21-
22-
23
24=== modified file 'NuxGraphics/XInputWindow.cpp'
25--- NuxGraphics/XInputWindow.cpp 2011-11-01 15:58:46 +0000
26+++ NuxGraphics/XInputWindow.cpp 2012-01-15 23:24:26 +0000
27@@ -335,10 +335,14 @@
28 {
29 XMapRaised(display_, window_);
30 mapped_ = true;
31+
32+ XEvent xevent;
33+ while (XCheckTypedWindowEvent(display_, window_, MapNotify, &xevent));
34+ XSetInputFocus(display_, window_, RevertToParent, CurrentTime);
35+
36 }
37 XMoveResizeWindow(display_, window_,
38 geometry_.x, geometry_.y,
39 geometry_.width, geometry_.height);
40 }
41 }
42-

Subscribers

People subscribed via source and target branches

to all changes: