X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-hbox-cell-renderer.c;h=568ea8e8b722009b069fc9a30c2e05f878e263e2;hb=52477aacdf91ada69605908ef5ce9af164afde32;hp=f177910c8d847fb0515ef95d7c237f51581f1495;hpb=7827149a00a401ddff9ca44b5c845f0f025cb09e;p=modest diff --git a/src/widgets/modest-hbox-cell-renderer.c b/src/widgets/modest-hbox-cell-renderer.c index f177910..568ea8e 100644 --- a/src/widgets/modest-hbox-cell-renderer.c +++ b/src/widgets/modest-hbox-cell-renderer.c @@ -30,7 +30,6 @@ #include #include - #include #include @@ -265,15 +264,11 @@ modest_hbox_cell_renderer_render (GtkCellRenderer *cell, GList *node = NULL; GtkCellRenderer *child; gint width, extra; - GtkRequisition req; direction = gtk_widget_get_direction (widget); nvis_children = 0; nexpand_children = 0; - /* first, retrieve the requisition of the children cell renderers */ - modest_hbox_cell_renderer_get_size (cell, widget, NULL, NULL, NULL, &(req.width), &(req.height)); - /* Counts visible and expandable children cell renderers */ for (node = priv->renderers_list; node != NULL; node = g_list_next (node)) { gboolean visible, expand; @@ -294,6 +289,10 @@ modest_hbox_cell_renderer_render (GtkCellRenderer *cell, GdkRectangle child_alloc; if (nexpand_children > 0) { + GtkRequisition req; + + /* retrieve the requisition of the children cell renderers */ + modest_hbox_cell_renderer_get_size (cell, widget, NULL, NULL, NULL, &(req.width), &(req.height)); width = cell_area->width - req.width; extra = width / nexpand_children; } else { @@ -317,7 +316,6 @@ modest_hbox_cell_renderer_render (GtkCellRenderer *cell, GtkRequisition child_req; gint child_xpad, child_ypad; GdkRectangle child_expose_area; - gtk_cell_renderer_get_size (child, widget, NULL, NULL, NULL, &(child_req.width), &(child_req.height)); g_object_get (child, "xpad", &child_xpad, "ypad", &child_ypad, NULL);