From 13baba4b3b2e22c44016c72de0d5f9850fa2b577 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sat, 17 Dec 2005 12:07:26 +0000 Subject: [PATCH] r4269: Bugfix: New detail crashes cleanice theme. Try another value... (reported by Andras Mohari). --- ROX-Filer/Help/Changes | 5 +++++ ROX-Filer/src/collection.c | 6 +++++- ROX-Filer/src/view_collection.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes index b1a34223..11e0f4fc 100644 --- a/ROX-Filer/Help/Changes +++ b/ROX-Filer/Help/Changes @@ -2,6 +2,11 @@ A RISC OS-like filer for X by Thomas Leonard +17-Dec-2005 +~~~~~~~~~~~ +Bugfix: New detail crashes cleanice theme. Try another value... (reported + by Andras Mohari). + 16-Dec-2005 ~~~~~~~~~~~ Highlight icons using the theme's preferred colour instead of always using diff --git a/ROX-Filer/src/collection.c b/ROX-Filer/src/collection.c index 40f62475..f4c05033 100644 --- a/ROX-Filer/src/collection.c +++ b/ROX-Filer/src/collection.c @@ -543,9 +543,13 @@ static gint collection_expose(GtkWidget *widget, GdkEventExpose *event) g_return_val_if_fail(IS_COLLECTION(widget), FALSE); g_return_val_if_fail(event != NULL, FALSE); + /* Note about 'detail' argument: + * - If set to "base", lighthouse theme will crash + * - If set to NULL, cleanice theme will crash + */ gtk_paint_flat_box(widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, &event->area, - widget, NULL, 0, 0, -1, -1); + widget, "collection", 0, 0, -1, -1); collection = COLLECTION(widget); diff --git a/ROX-Filer/src/view_collection.c b/ROX-Filer/src/view_collection.c index 20f07f4e..ccaf681f 100644 --- a/ROX-Filer/src/view_collection.c +++ b/ROX-Filer/src/view_collection.c @@ -338,7 +338,7 @@ static void draw_item(GtkWidget *widget, else selection_state = GTK_STATE_NORMAL; - color = &widget->style->base[selection_state]; + color = &widget->style->bg[selection_state]; fill_template(area, colitem, view_collection, &template); -- 2.11.4.GIT