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

Implement hide_edge_borders

Browse source
This commit is contained in:
Brian Ashworth 2018-05-11 18:44:56 -04:00
parent 2217518bd5
commit 3db7fc2bb2
5 changed files with 216 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

56
sway/tree/view.c
View file

@ -100,6 +100,9 @@ void view_autoconfigure(struct sway_view *view) {
return;
}
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
int other_views = ws->children->length - 1;
double x, y, width, height;
x = y = width = height = 0;
switch (view->border) {
@ -110,18 +113,51 @@ void view_autoconfigure(struct sway_view *view) {
height = view->swayc->height;
break;
case B_PIXEL:
x = view->swayc->x + view->border_thickness;
y = view->swayc->y + view->border_thickness;
width = view->swayc->width - view->border_thickness * 2;
height = view->swayc->height - view->border_thickness * 2;
if (view->swayc->layout > L_VERT
|| config->hide_edge_borders == E_NONE
|| config->hide_edge_borders == E_HORIZONTAL
|| (config->hide_edge_borders == E_SMART && other_views)) {
x = view->swayc->x + view->border_thickness;
width = view->swayc->width - view->border_thickness * 2;
} else {
x = view->swayc->x;
width = view->swayc->width;
}
if (view->swayc->layout > L_VERT
|| config->hide_edge_borders == E_NONE
|| config->hide_edge_borders == E_VERTICAL
|| (config->hide_edge_borders == E_SMART && other_views)) {
y = view->swayc->y + view->border_thickness;
height = view->swayc->height - view->border_thickness * 2;
} else {
y = view->swayc->y;
height = view->swayc->height;
}
break;
case B_NORMAL:
// Height is: border + title height + border + view height + border
x = view->swayc->x + view->border_thickness;
y = view->swayc->y + config->font_height + view->border_thickness * 2;
width = view->swayc->width - view->border_thickness * 2;
height = view->swayc->height - config->font_height
- view->border_thickness * 3;
if (view->swayc->layout > L_VERT
|| config->hide_edge_borders == E_NONE
|| config->hide_edge_borders == E_HORIZONTAL
|| (config->hide_edge_borders == E_SMART && other_views)) {
x = view->swayc->x + view->border_thickness;
width = view->swayc->width - view->border_thickness * 2;
} else {
x = view->swayc->x;
width = view->swayc->width;
}
if (view->swayc->layout > L_VERT
|| config->hide_edge_borders == E_NONE
|| config->hide_edge_borders == E_VERTICAL
|| (config->hide_edge_borders == E_SMART && other_views)) {
// Height is: border + title height + border + view height + border
y = view->swayc->y + config->font_height
+ view->border_thickness * 2;
height = view->swayc->height - config->font_height
- view->border_thickness * 3;
} else {
y = view->swayc->y;
height = view->swayc->height;
}
break;
}