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
This commit is contained in:
Bruno Boaventura 2007-04-01 15:31:24 +00:00 committed by Bruno Boaventura de Oliveira Lacerda
parent 81e32cfa32
commit 0bb8bd4370
2 changed files with 11 additions and 5 deletions

View File

@ -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> 2007-03-31 Elijah Newren <newren gmail com>
Clean up event mask handling and meta_create_offscreen_window, to Clean up event mask handling and meta_create_offscreen_window, to

View File

@ -3899,11 +3899,6 @@ get_button (MetaFrameStyle *style,
parent = parent->parent; 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 /* We fall back to middle button backgrounds if we don't
* have the ones on the sides * have the ones on the sides
*/ */
@ -3920,6 +3915,11 @@ get_button (MetaFrameStyle *style,
return get_button (style, META_BUTTON_TYPE_RIGHT_MIDDLE_BACKGROUND, return get_button (style, META_BUTTON_TYPE_RIGHT_MIDDLE_BACKGROUND,
state); 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; return op_list;
} }