mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #754 from thejan2009/containers-inside-tabbed-stacked 

Clarify which tabbed/stacked container we want (fixes #751)
This commit is contained in:
Drew DeVault 2016-07-16 10:26:45 -04:00 committed by GitHub
parent 7aeedf0264 ad7605675e
commit d5ad8c9036
7 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/container.h
View File

@ -262,6 +262,12 @@ bool swayc_is_empty_workspace(swayc_t *container);
* Returns the top most tabbed or stacked parent container. Returns NULL if
* view is not in a tabbed/stacked layout.
*/
swayc_t *swayc_tabbed_stacked_ancestor(swayc_t *view);
/**
* Returns the immediate tabbed or stacked parent container. Returns NULL if
* view is not directly in a tabbed/stacked layout.
*/
swayc_t *swayc_tabbed_stacked_parent(swayc_t *view);
/**

2
sway/border.c
View File

@ -318,7 +318,7 @@ void update_view_border(swayc_t *view) {
// for tabbed/stacked layouts the focused view has to draw all the
// titlebars of the hidden views.
swayc_t *p = NULL;
if (view->parent->focused == view && (p = swayc_tabbed_stacked_parent(view))) {
if (view->parent->focused == view && (p = swayc_tabbed_stacked_ancestor(view))) {
struct wlc_geometry g = {
.origin = {
.x = p->x,

2
sway/commands.c
View File

@ -2315,7 +2315,7 @@ static struct cmd_results *_do_split(int argc, char **argv, int layout) {
}
// update container title if tabbed/stacked
if (swayc_tabbed_stacked_parent(focused)) {
if (swayc_tabbed_stacked_ancestor(focused)) {
update_view_border(focused);
swayc_t *output = swayc_parent_by_type(focused, C_OUTPUT);
// schedule render to make changes take effect right away,

12
sway/container.c
View File

@ -878,7 +878,7 @@ void close_views(swayc_t *container) {
container_map(container, close_view, NULL);
}
swayc_t *swayc_tabbed_stacked_parent(swayc_t *view) {
swayc_t *swayc_tabbed_stacked_ancestor(swayc_t *view) {
swayc_t *parent = NULL;
if (!ASSERT_NONNULL(view)) {
return NULL;
@ -892,3 +892,13 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *view) {
return parent;
}
swayc_t *swayc_tabbed_stacked_parent(swayc_t *con) {
if (!ASSERT_NONNULL(con)) {
return NULL;
}
if (con->parent && (con->parent->layout == L_TABBED || con->parent->layout == L_STACKED)) {
return con->parent;
}
return NULL;
}

2
sway/focus.c
View File

@ -152,7 +152,7 @@ bool set_focused_container(swayc_t *c) {
}
// rearrange if parent container is tabbed/stacked
swayc_t *parent = swayc_tabbed_stacked_parent(p);
swayc_t *parent = swayc_tabbed_stacked_ancestor(p);
if (parent != NULL) {
arrange_windows(parent, -1, -1);
}

3
sway/handlers.c
View File

@ -523,8 +523,9 @@ static void handle_view_properties_updated(wlc_handle view, uint32_t mask) {
if (!c->name || strcmp(c->name, new_name) != 0) {
free(c->name);
c->name = strdup(new_name);
swayc_t *p = swayc_tabbed_stacked_parent(c);
swayc_t *p = swayc_tabbed_stacked_ancestor(c);
if (p) {
// TODO: we only got the topmost tabbed/stacked container, update borders of all containers on the path
update_view_border(get_focused_view(p));
} else if (c->border_type == B_NORMAL) {
update_view_border(c);

4
sway/layout.c
View File

@ -538,7 +538,7 @@ void update_geometry(swayc_t *container) {
int gap = 0;
// apply inner gaps to non-tabbed/stacked containers
swayc_t *p = swayc_tabbed_stacked_parent(container);
swayc_t *p = swayc_tabbed_stacked_ancestor(container);
if (p == NULL) {
gap = update_gap_geometry(container, &geometry);
}
@ -803,7 +803,7 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
y = container->border_geometry.origin.y;
}
// update container size if it's a child in a tabbed/stacked layout
// update container size if it's a direct child in a tabbed/stacked layout
if (swayc_tabbed_stacked_parent(container) != NULL) {
// Use parent actual_geometry as a base for calculating
// container geometry