aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@src.gnome.org>2007-10-01 15:21:43 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-10-01 15:21:43 +0800
commit6e14da5c593d08a8edf1155cd4378c889425c423 (patch)
treea82edec3d38fbc1fe328c866aa69cb862b2ec7a8
parent150493ab4bae218f3626768e8815a54c7cc0d1cf (diff)
downloadgsoc2013-evolution-6e14da5c593d08a8edf1155cd4378c889425c423.tar
gsoc2013-evolution-6e14da5c593d08a8edf1155cd4378c889425c423.tar.gz
gsoc2013-evolution-6e14da5c593d08a8edf1155cd4378c889425c423.tar.bz2
gsoc2013-evolution-6e14da5c593d08a8edf1155cd4378c889425c423.tar.lz
gsoc2013-evolution-6e14da5c593d08a8edf1155cd4378c889425c423.tar.xz
gsoc2013-evolution-6e14da5c593d08a8edf1155cd4378c889425c423.tar.zst
gsoc2013-evolution-6e14da5c593d08a8edf1155cd4378c889425c423.zip
2007-10-01 mcrha Fix for bug #474557
svn path=/trunk/; revision=34336
-rw-r--r--widgets/table/ChangeLog7
-rw-r--r--widgets/table/e-table-group-container.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 83b5b455da..c360875b85 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-01 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #474557
+
+ * e-table-group-container.c: (etgc_reflow):
+ Choose right widget and use PANGO_PIXELS to calculate height.
+
2007-09-27 Hiroyuki Ikezoe <poincare@ikezoe.net>
** Fix for bug #461195
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index d399c29824..ea5600760a 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -1009,11 +1009,11 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
PangoContext *context;
PangoFontMetrics *metrics;
- context = gtk_widget_get_pango_context (GTK_WIDGET (etgc));
+ context = gtk_widget_get_pango_context (GTK_WIDGET (item->canvas));
metrics = pango_context_get_metrics (context, etgc->font_desc, NULL);
extra_height +=
- pango_font_metrics_get_ascent (metrics) +
- pango_font_metrics_get_descent (metrics) +
+ PANGO_PIXELS (pango_font_metrics_get_ascent (metrics)) +
+ PANGO_PIXELS (pango_font_metrics_get_descent (metrics)) +
BUTTON_PADDING * 2;
pango_font_metrics_unref (metrics);
}