Compiz Expo Plugin

Merge lp:~smspillaz/compiz-expo-plugin/oneiric.fix_963767 into lp:~compiz-team/compiz-expo-plugin/oneiric

  1. oneiric.fix_963767
  2. Merge into oneiric
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 158
Proposed branch: lp:~smspillaz/compiz-expo-plugin/oneiric.fix_963767
Merge into: lp:~compiz-team/compiz-expo-plugin/oneiric
Diff against target: 47 lines (+7/-6)
2 files modified
CMakeLists.txt (+1/-1)
src/expo.cpp (+6/-5)
To merge this branch: bzr merge lp:~smspillaz/compiz-expo-plugin/oneiric.fix_963767
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+101059@code.launchpad.net

Description of the change

== Problem ==

[regression] Unity 5.8+Compiz 0.9.7.2: Launcher is being drawn twice in expo in "Expo" mode when it's "Always Visible"

== Solution ==

Also scale sideways

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Looks good to me...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2011-09-01 14:33:30 +0000
3+++ CMakeLists.txt 2012-04-06 03:30:32 +0000
4@@ -3,5 +3,5 @@
5 include (CompizPlugin)
6
7 if (OPENGL_GLU_FOUND)
8- compiz_plugin (expo PLUGINDEPS composite opengl LIBRARIES ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
9+ compiz_plugin (expo PLUGINDEPS composite opengl LIBRARIES ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR} PKGDEPS cairo cairo-xlib-xrender)
10 endif (OPENGL_GLU_FOUND)
11
12=== modified file 'src/expo.cpp'
13--- src/expo.cpp 2012-01-24 10:55:09 +0000
14+++ src/expo.cpp 2012-04-06 03:30:32 +0000
15@@ -171,7 +171,7 @@
16 if (!expoMode)
17 return false;
18
19- termExpo (action, 0, noOptions);
20+ termExpo (action, 0, noOptions ());
21 anyClick = true;
22 cScreen->damageScreen ();
23
24@@ -354,7 +354,7 @@
25 clickTime = 0;
26 doubleClick = false;
27
28- termExpo (&action, 0, noOptions);
29+ termExpo (&action, 0, noOptions ());
30 anyClick = true;
31 }
32 }
33@@ -1484,11 +1484,12 @@
34 {
35 CompOutput *o = &screen->outputDevs ()[screen->outputDeviceForGeometry(window->geometry())];
36 float yS = 1.0 + ((o->height () / (float) window->height ()) - 1.0f) * sigmoidProgress (eScreen->expoCam);
37- wTransform.translate (window->x () + window->width () / 2,
38+ float xS = 1.0 + ((o->width () / (float) window->width ()) - 1.0f) * sigmoidProgress (eScreen->expoCam);
39+ wTransform.translate (window->x () + window->width (),
40 window->y () + window->height (),
41 0.0f);
42- wTransform.scale (1.0f, yS, 1.0f);
43- wTransform.translate (-(window->x () + window->width () / 2),
44+ wTransform.scale (xS, yS, 1.0f);
45+ wTransform.translate (-(window->x () + window->width ()),
46 -(window->y () + window->height ()),
47 0.0f);
48

Subscribers

People subscribed via source and target branches