Do

Merge lp:~psybers/do/painters into lp:do

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

bug fixes for painters

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/AutohideTracker.cs'
2--- Do.Interface.Linux.Docky/src/Docky.Interface/AutohideTracker.cs 2009-05-31 00:40:37 +0000
3+++ Do.Interface.Linux.Docky/src/Docky.Interface/AutohideTracker.cs 2009-06-05 19:17:54 +0000
4@@ -85,7 +85,7 @@
5 {
6 Wnck.Window window = sender as Wnck.Window;
7
8- Gdk.Rectangle monitor = LayoutUtils.MonitorGemonetry ();
9+ Gdk.Rectangle monitor = LayoutUtils.MonitorGeometry ();
10 Gdk.Rectangle geo = window.EasyGeometry ();
11
12 geo.X = ((geo.X % monitor.Width) + monitor.Width) % monitor.Width;
13@@ -113,7 +113,7 @@
14 if (active != null) {
15 active.GeometryChanged += HandleGeometryChanged;
16 Gdk.Rectangle geo = active.EasyGeometry ();
17- Gdk.Rectangle monitor = LayoutUtils.MonitorGemonetry ();
18+ Gdk.Rectangle monitor = LayoutUtils.MonitorGeometry ();
19 geo.X = geo.X % monitor.Width;
20 geo.Y = geo.Y % monitor.Height;
21 last_known_geo = geo;
22@@ -123,7 +123,7 @@
23 public void UpdateWindowIntersect ()
24 {
25 Gdk.Rectangle adjustedDockArea = parent.MinimumDockArea;
26- Gdk.Rectangle geo = LayoutUtils.MonitorGemonetry ();
27+ Gdk.Rectangle geo = LayoutUtils.MonitorGeometry ();
28
29 adjustedDockArea.X = geo.X + (geo.Width - adjustedDockArea.Width) / 2;
30 switch (DockPreferences.Orientation) {
31
32=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
33--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs 2009-06-05 18:28:04 +0000
34+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs 2009-06-05 19:17:54 +0000
35@@ -112,7 +112,7 @@
36 public uint[] StrutRequest {
37 get {
38 uint[] values = new uint[12];
39- Gdk.Rectangle geo = LayoutUtils.MonitorGemonetry ();
40+ Gdk.Rectangle geo = LayoutUtils.MonitorGeometry ();
41
42 if (DockPreferences.AutohideType != AutohideType.None)
43 return values;
44@@ -232,7 +232,7 @@
45 void SetSize ()
46 {
47 Gdk.Rectangle geo;
48- geo = LayoutUtils.MonitorGemonetry ();
49+ geo = LayoutUtils.MonitorGeometry ();
50
51 Width = geo.Width;
52 if (AnimationState [Animations.UrgencyChanged])
53
54=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs'
55--- Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs 2009-06-01 20:37:58 +0000
56+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs 2009-06-05 19:17:54 +0000
57@@ -222,7 +222,7 @@
58
59 GetSize (out main.Width, out main.Height);
60 results_window.GetSize (out res.Width, out res.Height);
61- geo = LayoutUtils.MonitorGemonetry ();
62+ geo = LayoutUtils.MonitorGeometry ();
63
64 switch (DockPreferences.Orientation) {
65 case DockOrientation.Bottom:
66
67=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockPopupMenu.cs'
68--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockPopupMenu.cs 2009-05-19 17:32:30 +0000
69+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockPopupMenu.cs 2009-06-05 19:17:54 +0000
70@@ -127,7 +127,7 @@
71 header = description;
72 vertical_offset = horizontal_offset = 0;
73 ShowAll ();
74- Gdk.Rectangle geo = LayoutUtils.MonitorGemonetry ();
75+ Gdk.Rectangle geo = LayoutUtils.MonitorGeometry ();
76 Gtk.Requisition req = SizeRequest ();
77
78 Gdk.Point postion;
79
80=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/AbstractIntegratedPainter.cs'
81--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/AbstractIntegratedPainter.cs 2009-06-05 18:18:31 +0000
82+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/AbstractIntegratedPainter.cs 2009-06-05 19:19:38 +0000
83@@ -64,7 +64,7 @@
84 public void Clicked (Gdk.Rectangle dockArea, Gdk.Point cursor)
85 {
86 Gdk.Rectangle paintArea = new Gdk.Rectangle (0, 0, Width, dockArea.Height);
87- Gdk.Point paintAreaCursor = new Gdk.Point (cursor.X - dockArea.Left - DockPreferences.FullIconSize - BorderSize,
88+ Gdk.Point paintAreaCursor = new Gdk.Point (cursor.X - dockArea.Left - DockPreferences.FullIconSize - BorderSize - (dockArea.Width - MinimumWidth) / 2,
89 cursor.Y - dockArea.Top);
90
91 if (!paintArea.Contains (paintAreaCursor) || ReceiveClick (paintArea, paintAreaCursor))
92@@ -131,7 +131,7 @@
93 cr.Rectangle (dockArea.X, dockArea.Y, dockArea.Width, dockArea.Height);
94 cr.Clip ();
95
96- int x = dockArea.X + DockPreferences.FullIconSize + 2 * BorderSize;
97+ int x = dockArea.X + DockPreferences.FullIconSize + BorderSize;
98 x = x + (dockArea.Width - MinimumWidth) / 2;
99 buffer.Show (cr, x, dockArea.Y);
100 cr.ResetClip ();
101
102=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/LayoutUtils.cs'
103--- Do.Interface.Linux.Docky/src/Docky.Interface/LayoutUtils.cs 2009-04-29 08:44:10 +0000
104+++ Do.Interface.Linux.Docky/src/Docky.Interface/LayoutUtils.cs 2009-06-05 19:17:54 +0000
105@@ -60,7 +60,7 @@
106 monitor_geo = Gdk.Screen.Default.GetMonitorGeometry (DockPreferences.Monitor);
107 }
108
109- public static Gdk.Rectangle MonitorGemonetry ()
110+ public static Gdk.Rectangle MonitorGeometry ()
111 {
112 return monitor_geo;
113 }