aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2010-10-08 22:04:11 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-30 01:49:58 +0800
commited3ab11b8ebf4758b9b3a579b4795e12314076aa (patch)
tree4425fa6ed5501a4aeee721cf5900552626d4c0dd
parent6c5699c895af9b0211ab0b3d83be57b49336ac29 (diff)
downloadgsoc2013-evolution-ed3ab11b8ebf4758b9b3a579b4795e12314076aa.tar.gz
gsoc2013-evolution-ed3ab11b8ebf4758b9b3a579b4795e12314076aa.tar.zst
gsoc2013-evolution-ed3ab11b8ebf4758b9b3a579b4795e12314076aa.zip
e-table: Use semi-transparent red instead of stippled red
...when marking a header for deletion. Not that this does currently not work (it uses opaque red instead), but this change is required so stippling can be removed. And that is necessary to switch to Cairo drawing.
-rw-r--r--widgets/table/e-table-header-item.c16
-rw-r--r--widgets/table/e-table-header-item.h1
2 files changed, 1 insertions, 16 deletions
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 5e370fb0a6..f3ed548463 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -544,11 +544,6 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, gint col, gboolean recreate)
gtk_widget_show_all (arrow_up);
}
-#define gray50_width 2
-#define gray50_height 2
-static gchar gray50_bits[] = {
- 0x02, 0x01, };
-
static void
ethi_add_destroy_marker (ETableHeaderItem *ethi)
{
@@ -557,10 +552,6 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
if (ethi->remove_item)
g_object_run_dispose (G_OBJECT (ethi->remove_item));
- if (!ethi->stipple)
- ethi->stipple = gdk_bitmap_create_from_data (
- NULL, gray50_bits, gray50_width, gray50_height);
-
x1 = (gdouble) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col);
if (ethi->drag_col > 0)
x1 += ethi->group_indent_width;
@@ -574,8 +565,7 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
ethi->eth, ethi->drag_col, ethi->drag_col+1) - 2,
"y2", (gdouble) ethi->height - 2,
- "fill_color", "red",
- "fill_stipple", ethi->stipple,
+ "fill_color_rgba", 0xFF000080,
NULL);
}
@@ -998,10 +988,6 @@ ethi_unrealize (GnomeCanvasItem *item)
gtk_drag_dest_unset (GTK_WIDGET (item->canvas));
- if (ethi->stipple) {
- g_object_unref (ethi->stipple);
- ethi->stipple = NULL;
- }
if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)
(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)(item);
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index c78ecea897..6eb29df602 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -75,7 +75,6 @@ typedef struct {
guint drag_motion_id, drag_end_id, drag_leave_id, drag_drop_id, drag_data_received_id, drag_data_get_id;
guint sort_info_changed_id, group_info_changed_id;
GnomeCanvasItem *remove_item;
- GdkBitmap *stipple;
gchar *dnd_code;