From f5b9815128b6c000bb5d47c339480fa481a5e99d Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 26 Aug 2018 10:16:49 +1000 Subject: Prepare arrange code for type safe arguments This commit changes the arrange code in a way that will support type safe arguments. The arrange_output et al functions are now public, however I opted not to use them directly yet. I've kept the generic arrange_windows there for convenience until type safety is fully implemented. This means this patch has much less risk of breaking things as it would otherwise. To be type safe, arrange_children_of cannot exist in its previous form because the thing passed to it could be either a workspace or a container. So it's now renamed to arrange_children and accepts a list_t, as well as the parent layout and parent's box. There was some code which checked the grandparent's layout to see if it was tabbed or stacked and adjusted the Y offset of the grandchild accordingly. Accessing the grandparent layout isn't easy when using type safe arguments, and it seemed odd to even need to do this. I determined that this was needed because a child of a tabbed container would have a swayc Y matching the top of the tab bar. I've changed this so a child of a tabbed container will have a swayc Y matching the bottom of the tab bar, which means we don't need to access the grandparent layout. Some tweaks to the rendering and autoconfigure code have been made to implement this, and the container_at code appears to work without needing any changes. arrange_children_of (now arrange_children) would check if the parent had gaps and would copy them to the child, effectively making the workspace's gaps recurse into all children. We can't do this any more without passing has_gaps, gaps_inner and gaps_outer as arguments to arrange_children, so I've changed the add_gaps function to retrieve it from the workspace directly. apply_tabbed_or_stacked_layout has been split into two functions, as it had different logic depending on the layout. Lastly, arrange.h had an unnecessary include of transaction.h. I've removed it, which means I've had to add it to several other files. --- sway/tree/view.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index 2870d4f5..1a98c5f2 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -13,6 +13,7 @@ #include "log.h" #include "sway/criteria.h" #include "sway/commands.h" +#include "sway/desktop/transaction.h" #include "sway/ipc-server.h" #include "sway/output.h" #include "sway/input/seat.h" @@ -224,15 +225,13 @@ void view_autoconfigure(struct sway_view *view) { x = y = width = height = 0; double y_offset = 0; - // In a tabbed or stacked container, the swayc's y is the top of the title - // area. We have to offset the surface y by the height of the title bar, and - // disable any top border because we'll always have the title bar. - if (con->parent->layout == L_TABBED) { - y_offset = container_titlebar_height(); - view->border_top = false; - } else if (con->parent->layout == L_STACKED) { - y_offset = container_titlebar_height() * con->parent->children->length; + // In a tabbed or stacked container, the swayc's y is the bottom of the + // title area. We have to disable any top border because the title bar is + // rendered by the parent. + if (con->parent->layout == L_TABBED || con->parent->layout == L_STACKED) { view->border_top = false; + } else { + y_offset = container_titlebar_height(); } enum sway_container_border border = view->border; @@ -243,17 +242,17 @@ void view_autoconfigure(struct sway_view *view) { switch (border) { case B_NONE: x = con->x; - y = con->y + y_offset; + y = con->y; width = con->width; - height = con->height - y_offset; + height = con->height; break; case B_PIXEL: x = con->x + view->border_thickness * view->border_left; - y = con->y + view->border_thickness * view->border_top + y_offset; + y = con->y + view->border_thickness * view->border_top; width = con->width - view->border_thickness * view->border_left - view->border_thickness * view->border_right; - height = con->height - y_offset + height = con->height - view->border_thickness * view->border_top - view->border_thickness * view->border_bottom; break; @@ -263,15 +262,9 @@ void view_autoconfigure(struct sway_view *view) { width = con->width - view->border_thickness * view->border_left - view->border_thickness * view->border_right; - if (y_offset) { - y = con->y + y_offset; - height = con->height - y_offset - - view->border_thickness * view->border_bottom; - } else { - y = con->y + container_titlebar_height(); - height = con->height - container_titlebar_height() - - view->border_thickness * view->border_bottom; - } + y = con->y + y_offset; + height = con->height - y_offset + - view->border_thickness * view->border_bottom; break; } -- cgit v1.2.3