koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow changing the layout of workspaces by storing it (Thanks mhcerri)

Browse Source 
Before commit 4976fa3350, setting the
layout of workspaces to something else than the default would just mess
up the parent container of the workspace (the content container).

After that commit, it would create an unnecessary split container when
you change the layout _before_ opening any containers. To avoid this, we
now store the layout (similar to how the 'workspace_layout'
configuration directive works) and apply it when the first container is
attached to the workspace.

Fixes #796
This commit is contained in:
Michael Stapelberg
2012-09-16 22:53:41 +02:00
parent d660c4bcff
commit cd4dd365e8
6 changed files with 81 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/workspace.c
View File

@ -73,6 +73,7 @@ Con *workspace_get(const char *num, bool *created) {
workspace->type = CT_WORKSPACE;
FREE(workspace->name);
workspace->name = sstrdup(num);
workspace->workspace_layout = config.default_layout;
/* We set ->num to the number if this workspace’s name begins with a
* positive number. Otherwise it’s a named ws and num will be -1. */
char *endptr = NULL;
@ -742,7 +743,7 @@ void ws_force_orientation(Con *ws, orientation_t orientation) {
Con *workspace_attach_to(Con *ws) {
DLOG("Attaching a window to workspace %p / %s\n", ws, ws->name);
if (config.default_layout == L_DEFAULT) {
if (ws->workspace_layout == L_DEFAULT) {
DLOG("Default layout, just attaching it to the workspace itself.\n");
return ws;
}
@ -754,7 +755,7 @@ Con *workspace_attach_to(Con *ws) {
new->split = true;
/* 2: set the requested layout on the split con */
new->layout = config.default_layout;
new->layout = ws->workspace_layout;
/* 4: attach the new split container to the workspace */
DLOG("Attaching new split %p to workspace %p\n", new, ws);