summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-05-21 14:35:03 -0400
committerVictor Kareh <[email protected]>2019-06-05 10:49:37 -0400
commit17213f256a0c63c7f100e9b09fadbda4ee46a3ec (patch)
tree43228eb44892922b3111661e6bf8269fdc7f3278 /src
parent7d88bf4c26215d8090e5fa48b12a7063b9de4656 (diff)
downloadmarco-17213f256a0c63c7f100e9b09fadbda4ee46a3ec.tar.bz2
marco-17213f256a0c63c7f100e9b09fadbda4ee46a3ec.tar.xz
Allow raise_on_click to be set independent of focus_mode
Based on a patch by Thomas Jaeger <[email protected]> upstream commit: https://gitlab.gnome.org/GNOME/metacity/commit/03e8e63d
Diffstat (limited to 'src')
-rw-r--r--src/core/core.c3
-rw-r--r--src/core/prefs.c5
2 files changed, 2 insertions, 6 deletions
diff --git a/src/core/core.c b/src/core/core.c
index 5363df9c..b089e754 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -271,8 +271,7 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
meta_window_lower (window);
- if (meta_prefs_get_focus_mode () == META_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.
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 5565f744..2c93cf19 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -1092,10 +1092,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 == META_FOCUS_MODE_CLICK;
+ return raise_on_click;
}
const char*