mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-09 13:29:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fixes dealing with workspace_layout and related bugs [rfc]"

Browse source
This commit is contained in:
Drew DeVault 2016-10-12 21:26:06 -04:00 • committed by GitHub
parent 857eea8b63
commit 4cba91803e
7 changed files with 26 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sway/container.c
View file

@ -27,7 +27,6 @@ static swayc_t *new_swayc(enum swayc_types type) {
c->handle = -1;
c->gaps = -1;
c->layout = L_NONE;
c->workspace_layout = L_NONE;
c->type = type;
if (type != C_VIEW) {
c->children = create_list();
@ -210,8 +209,7 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
swayc_t *workspace = new_swayc(C_WORKSPACE);
workspace->prev_layout = L_NONE;
workspace->layout = L_HORIZ;
workspace->workspace_layout = default_layout(output);
workspace->layout = default_layout(output);
workspace->x = output->x;
workspace->y = output->y;
@ -264,7 +262,7 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
// add container to workspace chidren
add_child(workspace, cont);
// give them proper layouts
cont->layout = workspace->workspace_layout;
cont->layout = workspace->layout;
cont->prev_layout = workspace->prev_layout;
/* TODO: might break shit in move_container!!! workspace->layout = layout; */
set_focused_container_for(workspace, get_focused_view(workspace));
@ -931,12 +929,3 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *con) {
}
return NULL;
}
swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) {
if (container->type == C_WORKSPACE) {
container->workspace_layout = layout;
} else {
container->layout = layout;
}
return container;
}