[Xfce4-commits] Use configured text size when drawing text labels for missing flags. (cherry picked from commit c627b1b55afd107c634fd8530c781fbea2603829)

[Igor Slepchin]

Updating branch refs/heads/4.10_panel_support
         to e9160a826a448fa101c960eb19fba90c156967c0 (commit)
       from eb9727605d273572f03509a5c74c2d47fca6e6a7 (commit)

commit e9160a826a448fa101c960eb19fba90c156967c0
Author: Igor Slepchin <igor.slepc...@gmail.com>
Date:   Wed Jul 25 23:14:59 2012 -0400

    Use configured text size when drawing text labels for missing flags.
    (cherry picked from commit c627b1b55afd107c634fd8530c781fbea2603829)

 panel-plugin/xkb-cairo.c     |    3 ++-
 panel-plugin/xkb-cairo.h     |    1 +
 panel-plugin/xkb-callbacks.c |    1 +
 3 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/xkb-cairo.c b/panel-plugin/xkb-cairo.c
index 3b828ec..86af836 100644
--- a/panel-plugin/xkb-cairo.c
+++ b/panel-plugin/xkb-cairo.c
@@ -55,6 +55,7 @@ xkb_cairo_draw_flag (cairo_t *cr,
                      gint width,
                      gint height,
                      gint variant_markers_count,
+                     gint textsize,
                      GdkColor fgcolor)
 {
     gchar *filename;
@@ -81,7 +82,7 @@ xkb_cairo_draw_flag (cairo_t *cr,
                 actual_width, actual_height,
                 width, height,
                 variant_markers_count,
-                DISPLAY_TEXTSIZE_SMALL,     // not used for flag layout
+                textsize,
                 fgcolor);
         return;
     }
diff --git a/panel-plugin/xkb-cairo.h b/panel-plugin/xkb-cairo.h
index a8ecf32..e29d82b 100644
--- a/panel-plugin/xkb-cairo.h
+++ b/panel-plugin/xkb-cairo.h
@@ -42,6 +42,7 @@ void        xkb_cairo_draw_flag     (cairo_t *cr,
                                      gint width,
                                      gint height,
                                      gint variant_markers_count,
+                                     gint textsize,
                                      GdkColor fgcolor);
 
 void        xkb_cairo_draw_label    (cairo_t *cr,
diff --git a/panel-plugin/xkb-callbacks.c b/panel-plugin/xkb-callbacks.c
index d12e086..36e5375 100644
--- a/panel-plugin/xkb-callbacks.c
+++ b/panel-plugin/xkb-callbacks.c
@@ -121,6 +121,7 @@ xkb_plugin_layout_image_exposed (GtkWidget *widget,
                 actual_hsize, actual_vsize,
                 xkb->hsize, xkb->vsize,
                 xkb_config_variant_index_for_group (-1),
+                xkb->display_textsize,
                 fgcolor
         );
     }
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits