Merge lp:~muktupavels/compiz/gtk-window-decorator-5 into lp:compiz/0.9.12

[Alberts Muktupāvels]

Calculate correct button position in cairo theme.

Calculate correct button position in cairo theme.

Calculator window has minimize and close buttons, but does not have maximize button. In this case button position is returned incorrectly. Minimize button is visually in correct place, but event window is in wrong place (In place where it would be if window would have maximize button too).

[lp:~muktupavels/compiz/gtk-window-decorator-5]

3876. By Alberts Muktupāvels on 2014-07-09

Merge with lp:compiz

[Marco Trevisan (Treviño) (3v1n0)]

Ok seems reasonable

review: Approve

=== modified file 'gtk/window-decorator/cairo.c'
--- gtk/window-decorator/cairo.c	2013-05-13 15:39:25 +0000
+++ gtk/window-decorator/cairo.c	2014-07-09 10:49:50 +0000
@@ -817,6 +817,38 @@
     return FALSE;
 }
 
+static gboolean
+button_present (decor_t *d,
+                gint     i)
+{
+    switch (i) {
+        case BUTTON_MIN:
+            if (d->actions & WNCK_WINDOW_ACTION_MINIMIZE)
+                return TRUE;
+            break;
+        case BUTTON_MAX:
+            if (d->actions & WNCK_WINDOW_ACTION_MAXIMIZE)
+                return TRUE;
+            break;
+        case BUTTON_CLOSE:
+            if (d->actions & WNCK_WINDOW_ACTION_CLOSE)
+                return TRUE;
+            break;
+        case BUTTON_MENU:
+        case BUTTON_SHADE:
+        case BUTTON_ABOVE:
+        case BUTTON_STICK:
+        case BUTTON_UNSHADE:
+        case BUTTON_UNABOVE:
+        case BUTTON_UNSTICK:
+            break;
+        default:
+            break;
+    }
+
+    return FALSE;
+}
+
 gboolean
 get_button_position (decor_t *d,
 		     gint    i,
@@ -848,8 +880,16 @@
 	(d->frame->titlebar_height - 17);
 
     /* hack to position multiple buttons on the right */
-    if (i != BUTTON_MENU)
-	*x -= 10 + 16 * i;
+    if (i != BUTTON_MENU) {
+        gint position = 0;
+        gint button = 0;
+        while (button != i) {
+            if (button_present (d, button))
+                position++;
+            button++;
+        }
+        *x -= 10 + 16 * position;
+    }
 
     return TRUE;
 }