mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-05 16:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

wrap some views under workspaces

Browse source 
If workspace layout is set to tabbed or stacked, its C_VIEW children
should get wrapped in a container. Alongside that, move_container was
modified to retain previous functionality.
This commit is contained in:
D.B 2016-10-23 13:19:02 +02:00 committed by Drew DeVault
parent 6fb4b6737a
commit 4762bcb3b9
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sway/layout.c
View file

@ -66,6 +66,9 @@ void add_child(swayc_t *parent, swayc_t *child) {
if (!parent->focused) { if (!parent->focused) {
parent->focused = child; parent->focused = child;
} }
if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) {
child = new_container(child, parent->workspace_layout);
}
} }
void insert_child(swayc_t *parent, swayc_t *child, int index) { void insert_child(swayc_t *parent, swayc_t *child, int index) {
@ -80,6 +83,10 @@ void insert_child(swayc_t *parent, swayc_t *child, int index) {
if (!parent->focused) { if (!parent->focused) {
parent->focused = child; parent->focused = child;
} }
if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) {
child = new_container(child, parent->workspace_layout);
}
} }
void add_floating(swayc_t *ws, swayc_t *child) { void add_floating(swayc_t *ws, swayc_t *child) {
@ -255,6 +262,19 @@ void move_container(swayc_t *container, enum movement_direction dir) {
swayc_t *parent = container->parent; swayc_t *parent = container->parent;
swayc_t *child = container; swayc_t *child = container;
bool ascended = false; bool ascended = false;
// View is wrapped in intermediate container which is needed for displaying
// the titlebar. Moving only the view outside of its parent container would just
// wrap it again under worspace. There would effectively be no movement,
// just a change of wrapping container.
if (child->type == C_VIEW &&
parent->type == C_CONTAINER &&
parent->children->length == 1 &&
parent->parent->type == C_WORKSPACE) {
child = parent;
parent = parent->parent;
}
while (true) { while (true) {
sway_log(L_DEBUG, "container:%p, parent:%p, child %p,", sway_log(L_DEBUG, "container:%p, parent:%p, child %p,",
container,parent,child); container,parent,child);
@ -348,6 +368,9 @@ void move_container(swayc_t *container, enum movement_direction dir) {
} }
// Create container around workspace to insert child into // Create container around workspace to insert child into
parent = new_container(parent, layout); parent = new_container(parent, layout);
// Previous line set the resulting container's layout to
// workspace_layout. It should have been just layout.
parent->layout = parent->parent->layout;
} }
ascended = true; ascended = true;
child = parent; child = parent;