diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-01-13 22:58:21 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:19 +0800 |
| commit | 855ac5276542db2a3b236113dad6af7bc6af8d3c (patch) | |
| tree | 15b8370e3a936a2bb425b137029df38b8f879443 /widgets/table/e-cell-vbox.c | |
| parent | 80bc7035be2d07d14e60b09a624147f6e92d1dc6 (diff) | |
| download | gsoc2013-evolution-855ac5276542db2a3b236113dad6af7bc6af8d3c.tar gsoc2013-evolution-855ac5276542db2a3b236113dad6af7bc6af8d3c.tar.gz gsoc2013-evolution-855ac5276542db2a3b236113dad6af7bc6af8d3c.tar.bz2 gsoc2013-evolution-855ac5276542db2a3b236113dad6af7bc6af8d3c.tar.lz gsoc2013-evolution-855ac5276542db2a3b236113dad6af7bc6af8d3c.tar.xz gsoc2013-evolution-855ac5276542db2a3b236113dad6af7bc6af8d3c.tar.zst gsoc2013-evolution-855ac5276542db2a3b236113dad6af7bc6af8d3c.zip | |
Merge miscellaneous changes from gtk3 branch.
Mostly coding style and whitespace changes, to reduce diff noise.
Diffstat (limited to 'widgets/table/e-cell-vbox.c')
| -rw-r--r-- | widgets/table/e-cell-vbox.c | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index f752e14834..b170604ade 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -131,9 +131,16 @@ ecv_unrealize (ECellView *ecv) * ECell::draw method */ static void -ecv_draw (ECellView *ecell_view, GdkDrawable *drawable, - gint model_col, gint view_col, gint row, ECellFlags flags, - gint x1, gint y1, gint x2, gint y2) +ecv_draw (ECellView *ecell_view, + GdkDrawable *drawable, + gint model_col, + gint view_col, + gint row, + ECellFlags flags, + gint x1, + gint y1, + gint x2, + gint y2) { ECellVboxView *vbox_view = (ECellVboxView *)ecell_view; @@ -143,12 +150,20 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable, for (i = 0; i < vbox_view->subcell_view_count; i++) { /* Now cause our subcells to draw their contents, shifted by subcell_offset pixels */ - gint height = e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row); - e_cell_draw (vbox_view->subcell_views[i], drawable, - vbox_view->model_cols[i], view_col, row, flags, - x1, y1 + subcell_offset, x2, y1 + subcell_offset + height); - - subcell_offset += e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row); + gint height; + + height = e_cell_height ( + vbox_view->subcell_views[i], + vbox_view->model_cols[i], view_col, row); + e_cell_draw ( + vbox_view->subcell_views[i], drawable, + vbox_view->model_cols[i], view_col, row, flags, + x1, y1 + subcell_offset, x2, + y1 + subcell_offset + height); + + subcell_offset += e_cell_height ( + vbox_view->subcell_views[i], + vbox_view->model_cols[i], view_col, row); } } |