nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3376 from orestisf1993/floating-disable-scratchpad 

Don't disable floating in internal workspaces
This commit is contained in:
Ingo Bürk 2018-08-28 13:30:57 +02:00 committed by GitHub
parent f454a5c2dd 9718e38a7a
commit 9595263142
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/floating.c
View File

@ -366,6 +366,10 @@ void floating_disable(Con *con, bool automatic) {
}
Con *ws = con_get_workspace(con);
if (con_is_internal(ws)) {
LOG("Can't disable floating for container in internal workspace.\n");
return;
}
Con *tiling_focused = con_descend_tiling_focused(ws);
if (tiling_focused->type == CT_WORKSPACE) {

16
testcases/t/185-scratchpad.t
View File

@ -517,4 +517,20 @@ fresh_workspace;
$result = cmd 'scratchpad show';
is($result->[0]->{success}, 1, 'call to scratchpad in another workspace succeeded');
################################################################################
# 18: Disabling floating for a scratchpad window should not work.
################################################################################
kill_all_windows;
$ws = fresh_workspace;
$window = open_window;
cmd 'move scratchpad';
cmd '[id=' . $window->id . '] floating disable';
is(scalar @{get_ws_content($ws)}, 0, 'no window in workspace');
cmd 'scratchpad show';
is($x->input_focus, $window->id, 'scratchpad window shown');
done_testing;