From 4276005da46cdc821125189de8445dffcbb40805 Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Sun, 20 Feb 2011 20:10:37 +0100 Subject: [PATCH] [AdgText] Using logical_rect instead of ink_rect for extents The logical_rect, as defined by the pango_layout_get_extents() documentation, is better suited for providing what the ADG considers extents. For example using a fixed font, "---" and "XXX" should have the same extents despite their different ink boundary, so they can be aligned properly inside a table cell. --- src/adg/adg-dim-style.c | 6 +++--- src/adg/adg-table-style.c | 4 ++-- src/adg/adg-text.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/adg/adg-dim-style.c b/src/adg/adg-dim-style.c index 12ccdee8..a77338d3 100644 --- a/src/adg/adg-dim-style.c +++ b/src/adg/adg-dim-style.c @@ -245,11 +245,11 @@ adg_dim_style_init(AdgDimStyle *dim_style) data->to_offset = 6; data->beyond = 20; data->baseline_spacing = 32; - data->limits_spacing = 2; + data->limits_spacing = 0; data->quote_shift.x = 4; - data->quote_shift.y = -4; + data->quote_shift.y = -1; data->limits_shift.x = +2; - data->limits_shift.y = -4; + data->limits_shift.y = +2; data->number_format = g_strdup("%-.7g"); data->number_tag = g_strdup("<>"); diff --git a/src/adg/adg-table-style.c b/src/adg/adg-table-style.c index c09552d8..ca2d8991 100644 --- a/src/adg/adg-table-style.c +++ b/src/adg/adg-table-style.c @@ -159,8 +159,8 @@ adg_table_style_init(AdgTableStyle *table_style) data->title_dress = ADG_DRESS_FONT_ANNOTATION; data->value_dress = ADG_DRESS_FONT_TEXT; data->row_height = 30; - data->cell_padding.x = 5; - data->cell_padding.y = 5; + data->cell_padding.x = 3; + data->cell_padding.y = 3; data->cell_spacing.x = 0; data->cell_spacing.y = 0; diff --git a/src/adg/adg-text.c b/src/adg/adg-text.c index dcaccc53..6641a3b7 100644 --- a/src/adg/adg-text.c +++ b/src/adg/adg-text.c @@ -312,7 +312,7 @@ _adg_arrange(AdgEntity *entity) pango_layout_set_font_description(data->layout, font_description); } - pango_layout_get_extents(data->layout, &size, NULL); + pango_layout_get_extents(data->layout, NULL, &size); data->raw_extents.org.x = pango_units_to_double(size.x); data->raw_extents.org.y = pango_units_to_double(size.y); -- 2.11.4.GIT