Merge lp:~muktupavels/compiz/gwd-metacity-fix-button-width-calculation into lp:compiz/0.9.12

[Alberts Muktupāvels]

Fix button_width calculation in metacity theme.

Fix button_width calculation in metacity theme.

This fixes following visual problem:
http://postimg.org/image/54bgd5q3x/

[Stephen M. Webb (bregma)]

Is there a COmpiz ug associated with this?

[Alberts Muktupāvels (muktupavels)]

> Is there a COmpiz ug associated with this?

I don't know.

[MC Return (mc-return)]

Do I need a special theme to test this ?
With my theme Metacity's buttons are rendered correctly and I cannot reproduce the problem.

This looks unnecessary complicated:
if (!(frame_type < META_FRAME_TYPE_LAST))

could be:
if (frame_type >= META_FRAME_TYPE_LAST)

This is redundant as the value gets overwritten anyway in the next line:
mutter_draggable_border_width = 0;

or does
g_object_get (settings, "draggable-border-width", &mutter_draggable_border_width, NULL);
not overwrite the value of mutter_draggable_border_width in every case ?

review: Needs Information

[Alberts Muktupāvels (muktupavels)]

> Do I need a special theme to test this ?
> With my theme Metacity's buttons are rendered correctly and I cannot reproduce
> the problem.

https://github.com/horst3180/Vertex-theme
Problem was reported with his theme. In metacity buttons are rendered correctly but not in gwd. Buttons must be on right side.

> This looks unnecessary complicated:
> if (!(frame_type < META_FRAME_TYPE_LAST))
>
> could be:
> if (frame_type >= META_FRAME_TYPE_LAST)

I did not write much, it is copy & paste from existing code. I will change if needed.

> This is redundant as the value gets overwritten anyway in the next line:
> mutter_draggable_border_width = 0;

same as above...

> or does
> g_object_get (settings, "draggable-border-width",
> &mutter_draggable_border_width, NULL);
> not overwrite the value of mutter_draggable_border_width in every case ?

[MC Return (mc-return)]

I guess this depends on lp:~albertsmuktupavels/compiz/gwd-support-metacity-3-16 ?

As compiling with those changes only on Ubuntu 14.04 results in:
error: unknown type name ‘MetaFrameBorders’
error: too few arguments to function ‘meta_theme_get_frame_borders’
error: request for member ‘visible’ in something not a structure or union

[Alberts Muktupāvels (muktupavels)]

No, it does not depend on that branch.

Metacity version is 3.12, right? MetaFrameBorders are available in metacity 3.14. I will fix this later.

Did you reproduce problem?

[lp:~muktupavels/compiz/gwd-metacity-fix-button-width-calculation]

3942. By Alberts Muktupāvels on 2015-04-29

Fix build with metacity 3.12.x

[Alberts Muktupāvels (muktupavels)]

I did not test, but i think it should build now.

[Stephen M. Webb (bregma)]

This doesn;t seem to *break* anything in the themes I've tested with, so I'm going to go ahead an approve it.

review: Approve

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2014-10-07 20:06:52 +0000
+++ gtk/window-decorator/metacity.c	2015-04-29 16:07:58 +0000
@@ -819,10 +819,58 @@
 void
 meta_calc_button_size (decor_t *d)
 {
+    MetaTheme *theme;
+    MetaFrameType frame_type;
+    MetaFrameFlags flags;
+    MetaFrameGeometry fgeom;
+    MetaButtonLayout button_layout;
+    GdkRectangle clip;
+#ifdef HAVE_METACITY_3_14_0
+    MetaFrameBorders borders;
+#else
+    gint left_width, right_width, top_height, bottom_height;
+#endif
+    gint mutter_draggable_border_width;
     gint i, min_x, x, y, w, h, width;
 
+    if (!d->context)
+    {
+        d->button_width = 0;
+        return;
+    }
+
+    theme = meta_theme_get_current ();
+
+    frame_type = meta_frame_type_from_string (d->frame->type);
+    if (!(frame_type < META_FRAME_TYPE_LAST))
+        frame_type = META_FRAME_TYPE_NORMAL;
+
+    meta_get_decoration_geometry (d, theme, &flags, &fgeom, &button_layout,
+                                  frame_type, &clip);
+
+#ifdef HAVE_METACITY_3_14_0
+    meta_theme_get_frame_borders (theme, frame_type, d->frame->text_height,
+                                  flags, &borders);
+#else
+    meta_theme_get_frame_borders (theme, frame_type, d->frame->text_height,
+                                  flags, &top_height, &bottom_height,
+                                  &left_width, &right_width);
+#endif
+
+    mutter_draggable_border_width = 0;
+    g_object_get (settings, "draggable-border-width", &mutter_draggable_border_width, NULL);
+
     width = d->border_layout.top.x2 - d->border_layout.top.x1 -
-	    d->context->left_space - d->context->right_space;
+            d->context->left_space - d->context->right_space +
+#ifdef HAVE_METACITY_3_14_0
+            borders.visible.left + borders.visible.right;
+#else
+            left_width + right_width;
+#endif
+
+    if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
+        width += mutter_draggable_border_width;
+
     min_x = width;
 
     for (i = 0; i < 3; ++i)
@@ -844,7 +892,7 @@
 	}
     }
 
-    d->button_width = width - min_x + 6;
+    d->button_width = width - min_x;
 }
 
 gboolean