X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-vbox-cell-renderer.c;h=e711f5ccf0aa370f25498b9ad47d11f541d5a9a6;hp=e860433476fdcd4304d050e2ad174f64dca85c4d;hb=07c0fefbd027f14c5c3c4c509f9b7e0e6970ffbd;hpb=5f456f4b288067f9de646b31adabedef5a7171af diff --git a/src/widgets/modest-vbox-cell-renderer.c b/src/widgets/modest-vbox-cell-renderer.c index e860433..e711f5c 100644 --- a/src/widgets/modest-vbox-cell-renderer.c +++ b/src/widgets/modest-vbox-cell-renderer.c @@ -203,6 +203,8 @@ modest_vbox_cell_renderer_get_size (GtkCellRenderer *cell, { gint calc_width, calc_height; gint full_width, full_height; + guint xpad, ypad; + gfloat xalign, yalign; GList *node; ModestVBoxCellRendererPrivate *priv = MODEST_VBOX_CELL_RENDERER_GET_PRIVATE (cell); @@ -221,18 +223,25 @@ modest_vbox_cell_renderer_get_size (GtkCellRenderer *cell, } } - full_width = (gint) cell->xpad * 2 + calc_width; - full_height = (gint) cell->ypad * 2 + calc_height; + g_object_get (cell, + "xpad", &xpad, + "ypad", &ypad, + "xalign", &xalign, + "yalign", &yalign, + NULL); + + full_width = (gint) xpad * 2 + calc_width; + full_height = (gint) ypad * 2 + calc_height; if (rectangle && calc_width > 0 && calc_height > 0) { if (x_offset) { *x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? - (1.0 - cell->xalign) : cell->xalign) * + (1.0 - xalign) : xalign) * (rectangle->width - full_width)); *x_offset = MAX (*x_offset, 0); } if (y_offset) { - *y_offset = ((cell->yalign) * + *y_offset = ((yalign) * (rectangle->height - full_height)); *y_offset = MAX (*y_offset, 0); }