aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar athrungithub <athrun@arnet.com.ar>2019-01-30 11:05:46 -0300
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-01-30 09:05:46 -0500
commit5cb3d4769cb055f542e6cb5fc979dd8f0fb9a8f3 (patch)
treeda6e4444239550ddb5bde2156b3c2c7a50805bb1
parentMerge pull request #3535 from RedSoxFan/cleanup-log-on-config-failure (diff)
downloadsway-5cb3d4769cb055f542e6cb5fc979dd8f0fb9a8f3.tar.gz
sway-5cb3d4769cb055f542e6cb5fc979dd8f0fb9a8f3.tar.zst
sway-5cb3d4769cb055f542e6cb5fc979dd8f0fb9a8f3.zip
criteria & scratchpad verify if show in another workspace (#3522)
check if scratchpad is show in another workspace
-rw-r--r--sway/commands/scratchpad.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
index 714efa2b..71afa306 100644
--- a/sway/commands/scratchpad.c
+++ b/sway/commands/scratchpad.c
@@ -72,8 +72,10 @@ static void scratchpad_toggle_container(struct sway_container *con) {
72 return; 72 return;
73 } 73 }
74 74
75 struct sway_seat *seat = input_manager_current_seat();
76 struct sway_workspace *ws = seat_get_focused_workspace(seat);
75 // Check if it matches a currently visible scratchpad window and hide it. 77 // Check if it matches a currently visible scratchpad window and hide it.
76 if (con->workspace) { 78 if (con->workspace && ws == con->workspace) {
77 root_scratchpad_hide(con); 79 root_scratchpad_hide(con);
78 return; 80 return;
79 } 81 }