[evolution/gtk3] Bug #640526 - Default column width in address card view is small

[Milan Crha <mcrha src gnome org>]

commit 7401a1fced4fa1605ca1b0d1c8ba7b6386d8f376
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 26 11:35:34 2011 +0100

    Bug #640526 - Default column width in address card view is small

 addressbook/gui/widgets/e-minicard-view-widget.c |    4 +-
 addressbook/gui/widgets/gal-view-minicard.c      |    4 +-
 libgnomecanvas/gnome-canvas-rect.c               |   33 ++++++++++++---------
 views/addressbook/Address_Cards.galview          |    2 +-
 widgets/misc/e-canvas-background.c               |    2 +
 widgets/text/e-reflow.c                          |    2 +
 widgets/text/e-text.c                            |    7 ++++-
 7 files changed, 34 insertions(+), 20 deletions(-)
---
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 6751fc9..855b5c2 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -139,7 +139,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class)
 					 g_param_spec_double ("column_width",
 							      "Column Width",
 							      NULL,
-							      0.0, G_MAXDOUBLE, 150.0,
+							      0.0, G_MAXDOUBLE, 225.0,
 							      G_PARAM_READWRITE));
 
 	signals[CREATE_CONTACT] =
@@ -196,7 +196,7 @@ e_minicard_view_widget_init (EMinicardViewWidget *view)
 	view->book = NULL;
 	view->query = NULL;
 	view->editable = FALSE;
-	view->column_width = 150;
+	view->column_width = 225;
 }
 
 GtkWidget *
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
index baf62ec..383a562 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -82,7 +82,7 @@ view_minicard_load (GalView *view,
 	root = xmlDocGetRootElement (doc);
 	view_minicard->column_width =
 		e_xml_get_double_prop_by_name_with_default (
-		root, (guchar *) "column_width", 150);
+		root, (guchar *) "column_width", 225);
 	xmlFreeDoc (doc);
 }
 
@@ -175,7 +175,7 @@ static void
 gal_view_minicard_init (GalViewMinicard *gvm)
 {
 	gvm->title = NULL;
-	gvm->column_width = 150.0;
+	gvm->column_width = 225.0;
 
 	gvm->emvw = NULL;
 	gvm->emvw_column_width_changed_id = 0;
diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c
index c397be3..853992e 100644
--- a/libgnomecanvas/gnome-canvas-rect.c
+++ b/libgnomecanvas/gnome-canvas-rect.c
@@ -399,31 +399,36 @@ gnome_canvas_rect_draw (GnomeCanvasItem *item,
                         gint height)
 {
 	GnomeCanvasRect *rect;
-	cairo_matrix_t matrix, save_matrix;
+	cairo_matrix_t matrix;
 
 	rect = GNOME_CANVAS_RECT (item);
 
-	cairo_get_matrix (cr, &save_matrix);
 	cairo_save (cr);
 
 	gnome_canvas_item_i2c_matrix (item, &matrix);
 	cairo_transform (cr, &matrix);
 
-	cairo_rectangle (
-		cr,
-		rect->priv->x1 - x,
-		rect->priv->y1 - y,
-		rect->priv->x2 - rect->priv->x1,
-		rect->priv->y2 - rect->priv->y1);
-
-	if (gnome_canvas_rect_setup_for_fill (rect, cr))
-		cairo_fill_preserve (cr);
+	if (gnome_canvas_rect_setup_for_fill (rect, cr)) {
+		cairo_rectangle (
+			cr,
+			rect->priv->x1 - x,
+			rect->priv->y1 - y,
+			rect->priv->x2 - rect->priv->x1,
+			rect->priv->y2 - rect->priv->y1);
+		cairo_fill (cr);
+	}
 
-	if (gnome_canvas_rect_setup_for_stroke (rect, cr))
-		cairo_stroke_preserve (cr);
+	if (gnome_canvas_rect_setup_for_stroke (rect, cr)) {
+		cairo_rectangle (
+			cr,
+			rect->priv->x1 - x,
+			rect->priv->y1 - y,
+			rect->priv->x2 - rect->priv->x1,
+			rect->priv->y2 - rect->priv->y1);
+		cairo_stroke (cr);
+	}
 
 	cairo_restore (cr);
-	cairo_set_matrix (cr, &save_matrix);
 }
 
 static GnomeCanvasItem *
diff --git a/views/addressbook/Address_Cards.galview b/views/addressbook/Address_Cards.galview
index 4f6a865..70466da 100644
--- a/views/addressbook/Address_Cards.galview
+++ b/views/addressbook/Address_Cards.galview
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<EMinicardViewState column_width="150.0"/>
+<EMinicardViewState column_width="225.0"/>
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index cc43b5a..59d72f6 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -196,12 +196,14 @@ ecb_draw (GnomeCanvasItem *item,
 {
 	ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
 
+	cairo_save (cr);
         cairo_set_source_rgba (cr,
                                ((ecb->priv->rgba >> 24) & 0xff) / 255.0,
                                ((ecb->priv->rgba >> 16) & 0xff) / 255.0,
                                ((ecb->priv->rgba >>  8) & 0xff) / 255.0,
                                ( ecb->priv->rgba        & 0xff) / 255.0);
         cairo_paint (cr);
+	cairo_restore (cr);
 }
 
 static GnomeCanvasItem *
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index bf163aa..04572d9 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -1245,6 +1245,7 @@ e_reflow_draw (GnomeCanvasItem *item,
 		i /= column_width + E_REFLOW_FULL_GUTTER;
 		running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
 
+		cairo_save (cr);
 		gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
 
 		for (; i < reflow->column_count; i++) {
@@ -1259,6 +1260,7 @@ e_reflow_draw (GnomeCanvasItem *item,
                         cairo_fill (cr);
 			running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
 		}
+		cairo_restore (cr);
 	}
 }
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index fd32cae..7b13229 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -1294,6 +1294,8 @@ e_text_draw (GnomeCanvasItem *item, cairo_t *cr,
 	style = gtk_widget_get_style (widget);
 	window = gtk_widget_get_window (widget);
 
+	cairo_save (cr);
+
 	if (text->draw_background || text->draw_button) {
 		gdk_cairo_set_source_color (cr, &style->fg[state]);
 	} else {
@@ -1441,8 +1443,10 @@ e_text_draw (GnomeCanvasItem *item, cairo_t *cr,
 	if (!text->preedit_len)
 		reset_layout (text);
 
-	if (!pango_layout_get_text (text->layout))
+	if (!pango_layout_get_text (text->layout)) {
+		cairo_restore (cr);
 		return;
+	}
 
 	xpos = text->text_cx;
 	ypos = text->text_cy;
@@ -1516,6 +1520,7 @@ e_text_draw (GnomeCanvasItem *item, cairo_t *cr,
 	}
 
 	cairo_restore (cr);
+	cairo_restore (cr);
 }
 
 /* Point handler for the text item */