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

[Alberts Muktupāvels]

gtk-window-decorator: replace get_title_scale with update_titlebar_font_size.

Replace get_title_scale with update_titlebar_font_size. meta_theme_get_title_scale will be removed in Metacity 3.20.

This also removes useless calls to pango_font_description_get_size and pango_font_description_set_size when Cairo theme is used.

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

Thanks

review: Approve

[Sam Spilsbury (smspillaz)]

LGTM as well

review: Approve

=== modified file 'gtk/window-decorator/frames.c'
--- gtk/window-decorator/frames.c	2016-06-01 13:35:20 +0000
+++ gtk/window-decorator/frames.c	2016-06-01 13:35:20 +0000
@@ -516,8 +516,6 @@
 set_frame_scale (decor_frame_t *frame,
                  const gchar   *font_str)
 {
-    gfloat scale = 1.0f;
-
     gwd_decor_frame_ref (frame);
 
     if (frame->titlebar_font) {
@@ -526,14 +524,8 @@
     }
 
     if (font_str) {
-        gint size;
-
         frame->titlebar_font = pango_font_description_from_string (font_str);
-
-        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);
+        gwd_theme_update_titlebar_font_size (gwd_theme, frame, frame->titlebar_font);
     }
 
     gwd_decor_frame_unref (frame);

=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-06-01 13:35:20 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-06-01 13:35:20 +0000
@@ -1414,18 +1414,22 @@
     return TRUE;
 }
 
-static gfloat
-gwd_theme_metacity_get_title_scale (GWDTheme      *theme,
-                                    decor_frame_t *frame)
+static void
+gwd_theme_metacity_update_titlebar_font_size (GWDTheme             *theme,
+                                              decor_frame_t        *frame,
+                                              PangoFontDescription *titlebar_font)
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
     MetaFrameType type = meta_frame_type_from_string (frame->type);
-    MetaFrameFlags flags = 0xc33; /* FIXME */ 
+    MetaFrameFlags flags = 0xc33; /* FIXME */
+    MetaFrameStyle *style;
 
     if (type == META_FRAME_TYPE_LAST)
-        return 1.0f;
-
-    return meta_theme_get_title_scale (metacity->theme, type, flags);
+        type = META_FRAME_TYPE_NORMAL;
+
+    style = meta_theme_get_frame_style (metacity->theme, type, flags);
+
+    meta_frame_style_apply_scale (style, titlebar_font);
 }
 
 static void
@@ -1442,7 +1446,7 @@
     theme_class->update_border_extents = gwd_theme_metacity_update_border_extents;
     theme_class->get_event_window_position = gwd_theme_metacity_get_event_window_position;
     theme_class->get_button_position = gwd_theme_metacity_get_button_position;
-    theme_class->get_title_scale = gwd_theme_metacity_get_title_scale;
+    theme_class->update_titlebar_font_size = gwd_theme_metacity_update_titlebar_font_size;
 }
 
 static void

=== modified file 'gtk/window-decorator/gwd-theme.c'
--- gtk/window-decorator/gwd-theme.c	2016-05-26 13:33:24 +0000
+++ gtk/window-decorator/gwd-theme.c	2016-06-01 13:35:20 +0000
@@ -175,11 +175,11 @@
     return FALSE;
 }
 
-static gfloat
-gwd_theme_real_get_title_scale (GWDTheme      *theme,
-                                decor_frame_t *frame)
+static void
+gwd_theme_real_update_titlebar_font_size (GWDTheme             *theme,
+                                          decor_frame_t        *frame,
+                                          PangoFontDescription *titlebar_font)
 {
-    return 1.0;
 }
 
 static void
@@ -199,7 +199,7 @@
     theme_class->update_border_extents = gwd_theme_real_update_border_extents;
     theme_class->get_event_window_position = gwd_theme_real_get_event_window_position;
     theme_class->get_button_position = gwd_theme_real_get_button_position;
-    theme_class->get_title_scale = gwd_theme_real_get_title_scale;
+    theme_class->update_titlebar_font_size = gwd_theme_real_update_titlebar_font_size;
 
     properties[PROP_SETTINGS] =
         g_param_spec_object ("settings", "GWDSettings", "GWDSettings",
@@ -328,9 +328,11 @@
                                                              x, y, w, h);
 }
 
-gfloat
-gwd_theme_get_title_scale (GWDTheme      *theme,
-                           decor_frame_t *frame)
+void
+gwd_theme_update_titlebar_font_size (GWDTheme             *theme,
+                                     decor_frame_t        *frame,
+                                     PangoFontDescription *titlebar_font)
 {
-    return GWD_THEME_GET_CLASS (theme)->get_title_scale (theme, frame);
+    GWD_THEME_GET_CLASS (theme)->update_titlebar_font_size (theme, frame,
+                                                            titlebar_font);
 }

=== modified file 'gtk/window-decorator/gwd-theme.h'
--- gtk/window-decorator/gwd-theme.h	2016-05-20 11:56:36 +0000
+++ gtk/window-decorator/gwd-theme.h	2016-06-01 13:35:20 +0000
@@ -22,6 +22,7 @@
 
 #include <decoration.h>
 #include <glib-object.h>
+#include <pango/pango.h>
 
 G_BEGIN_DECLS
 
@@ -76,8 +77,9 @@
                                             gint                   *w,
                                             gint                   *h);
 
-    gfloat   (* get_title_scale)           (GWDTheme               *theme,
-                                            decor_frame_t          *frame);
+    void     (* update_titlebar_font_size) (GWDTheme               *theme,
+                                            decor_frame_t          *frame,
+                                            PangoFontDescription   *titlebar_font);
 };
 
 typedef enum
@@ -139,9 +141,10 @@
                                      gint                   *w,
                                      gint                   *h);
 
-gfloat
-gwd_theme_get_title_scale           (GWDTheme               *theme,
-                                     decor_frame_t          *frame);
+void
+gwd_theme_update_titlebar_font_size (GWDTheme               *theme,
+                                     decor_frame_t          *frame,
+                                     PangoFontDescription   *titlebar_font);
 
 G_END_DECLS