alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't apply hide_edge_borders to any floating container

Browse source 
This fixes the following scenario:
- Place a floating window so its border is right at the edge of the
  screen
- Create a new split
- The border disappears
- Moving the window does not restore the border
This commit is contained in:
novenary 2021-05-17 16:48:08 +03:00 committed by Tudor Brindus
parent d5c71231e5
commit dbc326ba84
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/tree/view.c
View file

@ -262,7 +262,7 @@ void view_autoconfigure(struct sway_view *view) {
con->pending.border_left = con->pending.border_right = true; con->pending.border_left = con->pending.border_right = true;
double y_offset = 0; double y_offset = 0;
if (!container_is_floating(con) && ws) { if (!container_is_floating_or_child(con) && ws) {
if (config->hide_edge_borders == E_BOTH if (config->hide_edge_borders == E_BOTH
|| config->hide_edge_borders == E_VERTICAL) { || config->hide_edge_borders == E_VERTICAL) {
con->pending.border_left = con->pending.x != ws->x; con->pending.border_left = con->pending.x != ws->x;
@ -281,14 +281,15 @@ void view_autoconfigure(struct sway_view *view) {
(config->hide_edge_borders_smart == ESMART_NO_GAPS && (config->hide_edge_borders_smart == ESMART_NO_GAPS &&
!gaps_to_edge(view)); !gaps_to_edge(view));
if (smart) { if (smart) {
bool show_border = container_is_floating_or_child(con) || bool show_border = !view_is_only_visible(view);
!view_is_only_visible(view);
con->pending.border_left &= show_border; con->pending.border_left &= show_border;
con->pending.border_right &= show_border; con->pending.border_right &= show_border;
con->pending.border_top &= show_border; con->pending.border_top &= show_border;
con->pending.border_bottom &= show_border; con->pending.border_bottom &= show_border;
} }
}
if (!container_is_floating(con)) {
// In a tabbed or stacked container, the container's y is the top of the // In a tabbed or stacked container, the container's y is the top of the
// title area. We have to offset the surface y by the height of the title, // 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. // bar, and disable any top border because we'll always have the title bar.