Allow raise_on_click to be set independent of focus_mode

Based on a patch by Thomas Jaeger <ThJaeger@gmail.com>
This commit is contained in:
Jasper St. Pierre 2014-12-28 22:36:27 -08:00
parent 5ad15bb5e5
commit 93b7137c62
2 changed files with 2 additions and 6 deletions

View File

@ -161,8 +161,7 @@ lower_window_and_transients (MetaWindow *window,
meta_window_foreach_transient (window, lower_window_and_transients, NULL);
if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
meta_prefs_get_raise_on_click ())
if (meta_prefs_get_raise_on_click ())
{
/* Move window to the back of the focusing workspace's MRU list.
* Do extra sanity checks to avoid possible race conditions.

View File

@ -1300,10 +1300,7 @@ meta_prefs_get_attach_modal_dialogs (void)
gboolean
meta_prefs_get_raise_on_click (void)
{
/* Force raise_on_click on for click-to-focus, as requested by Havoc
* in #326156.
*/
return raise_on_click || focus_mode == G_DESKTOP_FOCUS_MODE_CLICK;
return raise_on_click;
}
gboolean