Do

Merge lp:~psybers/do/do-services into lp:do

  1. do-services
  2. Merge into trunk
Proposed by Robert Dyer
Status: Merged
Merged at revision: not available
Proposed branch: lp:~psybers/do/do-services
Merge into: lp:do
Diff against target: None lines
To merge this branch: bzr merge lp:~psybers/do/do-services
Reviewer Review Type Date Requested Status
Jason Smith (community) Disapprove
Review via email: mp+6703@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Dyer (psybers) wrote :

Abstract painters now signal OnHideRequested when they are interrupted. WnckDockItems subscribe to the PainterServices PainterShow/HideRequest events instead of Summoned/Vanished events. This more accurately fixes the problem with setting/removing icon geometries to fix Compiz window previews.

Revision history for this message
Jason Smith (jassmith) :
review: Disapprove

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/WnckDockItem.cs'
2--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/WnckDockItem.cs 2009-05-15 23:14:35 +0000
3+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/WnckDockItem.cs 2009-05-19 18:45:34 +0000
4@@ -98,14 +98,14 @@
5
6 void RegisterEvents ()
7 {
8- DockServices.DoInteropService.Summoned += HandleSummoned;
9- DockServices.DoInteropService.Vanished += HandleVanished;
10+ DockServices.PainterService.PainterShowRequest += HandleShowRequest;
11+ DockServices.PainterService.PainterHideRequest += HandleHideRequest;
12 }
13
14 void UnregisterEvents ()
15 {
16- DockServices.DoInteropService.Summoned -= HandleSummoned;
17- DockServices.DoInteropService.Vanished -= HandleVanished;
18+ DockServices.PainterService.PainterShowRequest -= HandleShowRequest;
19+ DockServices.PainterService.PainterHideRequest -= HandleHideRequest;
20 }
21
22 public override void SetIconRegion (Gdk.Rectangle region)
23@@ -179,12 +179,12 @@
24 base.Clicked (button, state, position);
25 }
26
27- public void HandleSummoned (object sender, EventArgs e)
28+ public void HandleShowRequest (object sender, EventArgs e)
29 {
30 VisibleWindows.ForEach (w => w.SetIconGeometry (0, 0, 0, 0));
31 }
32
33- public void HandleVanished (object sender, EventArgs e)
34+ public void HandleHideRequest (object sender, EventArgs e)
35 {
36 SetIconRegionFromCache ();
37 }
38
39=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/AbstractIntegratedPainter.cs'
40--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/AbstractIntegratedPainter.cs 2009-05-08 04:13:06 +0000
41+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/AbstractIntegratedPainter.cs 2009-05-19 18:51:02 +0000
42@@ -102,6 +102,7 @@
43
44 public virtual void Interrupt ()
45 {
46+ OnHideRequested ();
47 }
48
49 public void Paint (Cairo.Context cr, Gdk.Rectangle dockArea, Gdk.Point cursor)