From 0bb8bd4370cd876188b93393ca5fd043ea4db108 Mon Sep 17 00:00:00 2001 From: Bruno Boaventura Date: Sun, 1 Apr 2007 15:31:24 +0000 Subject: [PATCH] Fallback to NORMAL state after checking for the middle button. Fixes bug 2007-01-27 Bruno Boaventura * src/theme.c (kill_window_question): Fallback to NORMAL state after checking for the middle button. Fixes bug #419043. Patch from Benjamin Berg . svn path=/trunk/; revision=3140 --- ChangeLog | 6 ++++++ src/theme.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e128c963..1a2f22d38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-27 Bruno Boaventura + + * src/theme.c (kill_window_question): Fallback to NORMAL state after + checking for the middle button. Fixes bug #419043. + Patch from Benjamin Berg . + 2007-03-31 Elijah Newren Clean up event mask handling and meta_create_offscreen_window, to diff --git a/src/theme.c b/src/theme.c index 4ca628c81..b1ac7282c 100644 --- a/src/theme.c +++ b/src/theme.c @@ -3899,11 +3899,6 @@ get_button (MetaFrameStyle *style, parent = parent->parent; } - /* We fall back to normal if no prelight */ - if (op_list == NULL && - state == META_BUTTON_STATE_PRELIGHT) - return get_button (style, type, META_BUTTON_STATE_NORMAL); - /* We fall back to middle button backgrounds if we don't * have the ones on the sides */ @@ -3920,6 +3915,11 @@ get_button (MetaFrameStyle *style, return get_button (style, META_BUTTON_TYPE_RIGHT_MIDDLE_BACKGROUND, state); + /* We fall back to normal if no prelight */ + if (op_list == NULL && + state == META_BUTTON_STATE_PRELIGHT) + return get_button (style, type, META_BUTTON_STATE_NORMAL); + return op_list; }