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

Merge pull request #2210 from Airblader/bug-2166 

Don't allow floating workspaces anymore.
This commit is contained in:
Michael Stapelberg 2016-02-15 08:15:23 +01:00
parent d6aece03ee 9431ef16f6
commit e91fa09569
2 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/floating.c
View File

@ -116,48 +116,10 @@ void floating_enable(Con *con, bool automatic) {
return; return;
} }
/* 1: If the container is a workspace container, we need to create a new
* split-container with the same layout and make that one floating. We
* cannot touch the workspace container itself because floating containers
* are children of the workspace. */
if (con->type == CT_WORKSPACE) { if (con->type == CT_WORKSPACE) {
LOG("This is a workspace, creating new container around content\n"); LOG("Container is a workspace, not enabling floating mode.\n");
if (con_num_children(con) == 0) {
LOG("Workspace is empty, aborting\n");
return; return;
} }
/* TODO: refactor this with src/con.c:con_set_layout */
Con *new = con_new(NULL, NULL);
new->parent = con;
new->layout = con->layout;
/* since the new container will be set into floating mode directly
* afterwards, we need to copy the workspace rect. */
memcpy(&(new->rect), &(con->rect), sizeof(Rect));
Con *old_focused = TAILQ_FIRST(&(con->focus_head));
if (old_focused == TAILQ_END(&(con->focus_head)))
old_focused = NULL;
/* 4: move the existing cons of this workspace below the new con */
DLOG("Moving cons\n");
Con *child;
while (!TAILQ_EMPTY(&(con->nodes_head))) {
child = TAILQ_FIRST(&(con->nodes_head));
con_detach(child);
con_attach(child, new, true);
}
/* 4: attach the new split container to the workspace */
DLOG("Attaching new split to ws\n");
con_attach(new, con, false);
if (old_focused)
con_focus(old_focused);
con = new;
set_focus = false;
}
/* 1: detach the container from its parent */ /* 1: detach the container from its parent */
/* TODO: refactor this with tree_close_internal() */ /* TODO: refactor this with tree_close_internal() */

5
testcases/t/155-floating-split-size.t
View File

@ -21,6 +21,9 @@ use i3test;
my $tmp = fresh_workspace; my $tmp = fresh_workspace;
open_window;
cmd 'split v';
##################################################################### #####################################################################
# open a window with 200x80 # open a window with 200x80
##################################################################### #####################################################################
@ -30,6 +33,8 @@ my $first = open_window({
background_color => '#FF0000', background_color => '#FF0000',
}); });
cmd 'split h';
##################################################################### #####################################################################
# Open a second window with 300x90 # Open a second window with 300x90
##################################################################### #####################################################################