X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_gfx.c;h=30a372af8fc098dfeb7fcbcef16e6c68ef18c673;hb=9cd66f2d7fbf16ca07e1709cd156ae78cd0da278;hp=8a18ce42eb268f0d175b20192967ee1334c4c5c3;hpb=04ed1c285ff739ad2cd1384e6cfe24aea82cfa7e;p=rrdtool.git

diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index 8a18ce4..30a372a 100644
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2.23  Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.3rc7  Copyright by Tobi Oetiker, 1997-2008
  ****************************************************************************
  * rrd_gfx.c  graphics wrapper for rrdtool
   **************************************************************************/
@@ -131,6 +131,7 @@ static PangoLayout *gfx_prep_text(
     long      i;
     long      tab_count = strlen(text);
     long      tab_shift = fmod(x, tabwidth);
+    int       border = im->text_prop[TEXT_PROP_LEGEND].size * 2.0;
 
     PangoTabArray *tab_array;
     PangoContext *pango_context;
@@ -138,7 +139,7 @@ static PangoLayout *gfx_prep_text(
     tab_array = pango_tab_array_new(tab_count, (gboolean) (1));
     for (i = 1; i <= tab_count; i++) {
         pango_tab_array_set_tab(tab_array,
-                                i, PANGO_TAB_LEFT, tabwidth * i - tab_shift);
+                                i, PANGO_TAB_LEFT, tabwidth * i - tab_shift+border);
     }
     cairo_new_path(cr);
     cairo_set_source_rgba(cr, color.red, color.green, color.blue,
@@ -146,7 +147,9 @@ static PangoLayout *gfx_prep_text(
     layout = pango_cairo_create_layout(cr);
     pango_context = pango_layout_get_context(layout);
     pango_cairo_context_set_font_options(pango_context, im->font_options);
-    pango_cairo_update_context(cr, pango_context);
+    pango_cairo_context_set_resolution(pango_context, 100);
+
+/*     pango_cairo_update_context(cr, pango_context); */
 
     pango_layout_set_tabs(layout, tab_array);
     font_desc = pango_font_description_from_string(font);
@@ -168,13 +171,6 @@ double gfx_get_text_width(
     PangoLayout *layout;
     PangoRectangle log_rect;
     gfx_color_t color = { 0, 0, 0, 0 };
-    char     *tab;
-
-    /* turn \\t into tab */
-    while ((tab = strstr(text, "\\t"))) {
-        memmove(tab + 1, tab + 2, strlen(tab + 2));
-        tab[0] = (char) 9;
-    }
     layout = gfx_prep_text(im, start, color, font, size, tabwidth, text);
     pango_layout_get_pixel_extents(layout, NULL, &log_rect);
     pango_tab_array_free(pango_layout_get_tabs(layout));