diff options
| author | Bruno Boaventura <brunobol@gnome.org> | 2007-04-01 15:31:24 +0000 |
|---|---|---|
| committer | Bruno Boaventura de Oliveira Lacerda <brunobol@src.gnome.org> | 2007-04-01 15:31:24 +0000 |
| commit | 0bb8bd4370cd876188b93393ca5fd043ea4db108 (patch) | |
| tree | 7c8c2a7256a7963603ac5ab07194e23d24de0b17 | |
| parent | 81e32cfa324500bc5e2b2ff0d24cdd2fb532e796 (diff) | |
| download | metacity-0bb8bd4370cd876188b93393ca5fd043ea4db108.tar.gz | |
Fallback to NORMAL state after checking for the middle button. Fixes bug
2007-01-27 Bruno Boaventura <brunobol@gnome.org>
* src/theme.c (kill_window_question): Fallback to NORMAL state after
checking for the middle button. Fixes bug #419043.
Patch from Benjamin Berg <benjamin@sipsolutions.net>.
svn path=/trunk/; revision=3140
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/theme.c | 10 |
2 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2007-01-27 Bruno Boaventura <brunobol@gnome.org> + + * src/theme.c (kill_window_question): Fallback to NORMAL state after + checking for the middle button. Fixes bug #419043. + Patch from Benjamin Berg <benjamin@sipsolutions.net>. + 2007-03-31 Elijah Newren <newren gmail com> Clean up event mask handling and meta_create_offscreen_window, to diff --git a/src/theme.c b/src/theme.c index 4ca628c8..b1ac7282 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; } |