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

Handle border options for gaps

Browse source 
Fixes `hide_edge_borders smart` when gaps are in use.
Implements `hide_edge_borders smart_no_gaps` and `smart_borders
on|no_gaps|off`.

Since `smart_borders on` is equivalent to `hide_edge_borders smart`
and `smart_borders no_gaps` is equivalent to `hide_edge_borders
smart_no_gaps`, I opted to just save the last value set for
`hide_edge_borders` and restore that on `smart_borders off`. This
simplifies the conditions for setting the border.
This commit is contained in:
Brian Ashworth 2018-10-01 12:56:27 -04:00
parent b542c5413e
commit bb25194844
9 changed files with 68 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
sway/tree/view.c
View file

@ -179,6 +179,17 @@ bool view_is_only_visible(struct sway_view *view) {
return only_view;
}
static bool gaps_to_edge(struct sway_view *view) {
struct sway_container *con = view->container;
while (con) {
if (con->current_gaps > 0) {
return true;
}
con = con->parent;
}
return view->container->workspace->current_gaps > 0;
}
void view_autoconfigure(struct sway_view *view) {
if (!view->container->workspace) {
// Hidden in the scratchpad
@ -196,23 +207,27 @@ void view_autoconfigure(struct sway_view *view) {
struct sway_workspace *ws = view->container->workspace;
struct sway_container *con = view->container;
bool other_views = config->hide_edge_borders == E_SMART ?
!view_is_only_visible(view) : false;
bool smart = config->hide_edge_borders == E_SMART ||
config->hide_edge_borders == E_SMART_NO_GAPS;
bool other_views = smart && !view_is_only_visible(view);
bool no_gaps = config->hide_edge_borders != E_SMART_NO_GAPS
|| !gaps_to_edge(view);
view->border_top = view->border_bottom = true;
view->border_left = view->border_right = true;
if (config->hide_edge_borders == E_BOTH
|| config->hide_edge_borders == E_VERTICAL
|| (config->hide_edge_borders == E_SMART && !other_views)) {
view->border_left = con->x != ws->x;
int right_x = con->x + con->width;
|| (smart && !other_views && no_gaps)) {
view->border_left = con->x - con->current_gaps != ws->x;
int right_x = con->x + con->width + con->current_gaps;
view->border_right = right_x != ws->x + ws->width;
}
if (config->hide_edge_borders == E_BOTH
|| config->hide_edge_borders == E_HORIZONTAL
|| (config->hide_edge_borders == E_SMART && !other_views)) {
view->border_top = con->y != ws->y;
int bottom_y = con->y + con->height;
|| (smart && !other_views && no_gaps)) {
view->border_top = con->y - con->current_gaps != ws->y;
int bottom_y = con->y + con->height + con->current_gaps;
view->border_bottom = bottom_y != ws->y + ws->height;
}