From 543b6971b4bbd585fd31f6f65cbe5b0443b35a0c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 6 Jun 2008 14:44:49 +0000 Subject: [PATCH] 2008-06-06 Emmanuele Bassi Bug #955 - ClutterLabel is missing fallback resolution handling * clutter/clutter-label.c (clutter_label_init): Handle clutter_backend_get_resolution() return value -1 similar to ClutterEntry (falling back to 96.0). (#955, Tommi Komulainen) --- ChangeLog | 8 ++++++++ clutter/clutter-label.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index bb5929c..9cd0414 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-06 Emmanuele Bassi + + Bug #955 - ClutterLabel is missing fallback resolution handling + + * clutter/clutter-label.c (clutter_label_init): Handle + clutter_backend_get_resolution() return value -1 similar to + ClutterEntry (falling back to 96.0). (#955, Tommi Komulainen) + 2008-06-06 Neil Roberts * clutter/eglnative/clutter-stage-egl.c diff --git a/clutter/clutter-label.c b/clutter/clutter-label.c index a55d292..09e5595 100644 --- a/clutter/clutter-label.c +++ b/clutter/clutter-label.c @@ -647,6 +647,8 @@ clutter_label_init (ClutterLabel *self) _context = pango_clutter_font_map_create_context (font_map); resolution = clutter_backend_get_resolution (backend); + if (resolution < 0) + resolution = 96.0; pango_cairo_context_set_resolution (_context, resolution); font_options = clutter_backend_get_font_options (backend); -- 2.7.4