Merge lp:~muktupavels/compiz/gwd-theme-implement-get-title-scale into lp:compiz/0.9.12

[Alberts Muktupāvels]

GWDTheme: implement get_title_scale.

GWDTheme: implement get_title_scale.

[Sam Spilsbury (smspillaz)]

LGTM asides from the minor changes in the diff comments

[lp:~muktupavels/compiz/gwd-theme-implement-get-title-scale]

4030. By Alberts Muktupāvels on 2016-05-20

Merge changes from lp:~albertsmuktupavels/compiz/gwd-theme-implement-update-border-extents.

4031. By Alberts Muktupāvels on 2016-05-20

Assign and declare.

[Alberts Muktupāvels (muktupavels)]

Pushed small update. Is this now ok?

Lets leave flags and enum if as it was in original code...

- flags are hardcoded because we dont have access to decor_t in that function.
- meta_frame_type_from_string can return META_FRAME_TYPE_LAST.

[Sam Spilsbury (smspillaz)]

Looks good to me

review: Approve

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

review: Approve

=== modified file 'gtk/window-decorator/cairo.c'
--- gtk/window-decorator/cairo.c	2016-05-20 10:50:58 +0000
+++ gtk/window-decorator/cairo.c	2016-05-20 10:50:58 +0000
@@ -948,9 +948,3 @@
 	     pos[i][j].hh * height + pos[i][j].hth * (d->frame->titlebar_height - 17);
     }
 }
-
-gfloat
-get_title_scale (decor_frame_t *frame)
-{
-    return 1.0f;
-}

=== modified file 'gtk/window-decorator/frames.c'
--- gtk/window-decorator/frames.c	2016-05-20 10:50:58 +0000
+++ gtk/window-decorator/frames.c	2016-05-20 10:50:58 +0000
@@ -560,7 +560,7 @@
 
         frame->titlebar_font = pango_font_description_from_string (font_str);
 
-        scale = (*theme_get_title_scale) (frame);
+        scale = gwd_theme_get_title_scale (gwd_theme, frame);
         size = MAX (pango_font_description_get_size (frame->titlebar_font) * scale, 1);
 
         pango_font_description_set_size (frame->titlebar_font, size);

=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2016-05-20 10:50:58 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2016-05-20 10:50:58 +0000
@@ -175,7 +175,6 @@
         theme_calc_decoration_size = meta_calc_decoration_size;
         theme_get_event_window_position = meta_get_event_window_position;
         theme_get_button_position = meta_get_button_position;
-        theme_get_title_scale = meta_get_title_scale;
     } else {
         g_log ("gtk-window-decorator", G_LOG_LEVEL_INFO, "using cairo decoration");
 
@@ -185,7 +184,6 @@
         theme_calc_decoration_size = calc_decoration_size;
         theme_get_event_window_position = get_event_window_position;
         theme_get_button_position = get_button_position;
-        theme_get_title_scale = get_title_scale;
     }
 #else
     type = GWD_THEME_TYPE_CAIRO;
@@ -194,7 +192,6 @@
     theme_calc_decoration_size = calc_decoration_size;
     theme_get_event_window_position = get_event_window_position;
     theme_get_button_position = get_button_position;
-    theme_get_title_scale = get_title_scale;
 #endif
 
     g_set_object (&gwd_theme, gwd_theme_new (type, settings));

=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2016-05-20 10:50:58 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2016-05-20 10:50:58 +0000
@@ -332,7 +332,6 @@
 					     gint    *y,
 					     gint    *w,
 					     gint    *h);
-gfloat (*theme_get_title_scale)		    (decor_frame_t *frame);
 
 extern char *program_name;
 
@@ -585,9 +584,6 @@
 			   gint    *w,
 			   gint    *h);
 
-gfloat
-get_title_scale (decor_frame_t *frame);
-
 /* gdk.c */
 
 GdkWindow *
@@ -648,9 +644,6 @@
 				gint    *w,
 				gint    *h);
 
-gfloat
-meta_get_title_scale (decor_frame_t *);
-
 void
 meta_update_button_layout (const char *value);
 

=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-05-20 10:50:58 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-05-20 10:50:58 +0000
@@ -96,6 +96,20 @@
     gwd_decor_frame_unref (frame);
 }
 
+static gfloat
+gwd_theme_metacity_get_title_scale (GWDTheme      *theme,
+                                    decor_frame_t *frame)
+{
+    GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
+    MetaFrameType type = meta_frame_type_from_string (frame->type);
+    MetaFrameFlags flags = 0xc33; /* FIXME */ 
+
+    if (type == META_FRAME_TYPE_LAST)
+        return 1.0f;
+
+    return meta_theme_get_title_scale (metacity->theme, type, flags);
+}
+
 static void
 gwd_theme_metacity_class_init (GWDThemeMetacityClass *metacity_class)
 {
@@ -105,6 +119,7 @@
     object_class->constructor = gwd_theme_metacity_constructor;
 
     theme_class->update_border_extents = gwd_theme_metacity_update_border_extents;
+    theme_class->get_title_scale = gwd_theme_metacity_get_title_scale;
 }
 
 static void

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2016-05-20 10:50:58 +0000
+++ gtk/window-decorator/metacity.c	2016-05-20 10:50:58 +0000
@@ -991,25 +991,6 @@
     return TRUE;
 }
 
-gfloat
-meta_get_title_scale (decor_frame_t *frame)
-{
-    MetaTheme *theme;
-    MetaFrameType type;
-    MetaFrameFlags flags; 
-
-    theme = meta_theme_get_current ();
-    type = meta_frame_type_from_string (frame->type);
-    flags = 0xc33; /* fixme */
-
-    if (type == META_FRAME_TYPE_LAST)
-        return 1.0f;
-
-    gfloat scale = meta_theme_get_title_scale (theme, type, flags);
-
-    return scale;
-}
-
 gboolean
 meta_calc_decoration_size (decor_t *d,
                            gint     w,