nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1892 from Airblader/bug-1215 

Fix rendering bug for floating windows
This commit is contained in:
Michael Stapelberg 2015-09-05 12:46:47 +02:00
parent ee2983c791 d657c9c7a5
commit 9aa41894da
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/con.c
View File

@ -1245,18 +1245,13 @@ Rect con_border_style_rect(Con *con) {
int border_style = con_border_style(con); int border_style = con_border_style(con);
if (border_style == BS_NONE) if (border_style == BS_NONE)
return (Rect){0, 0, 0, 0}; return (Rect){0, 0, 0, 0};
borders_to_hide = con_adjacent_borders(con) & config.hide_edge_borders;
if (border_style == BS_NORMAL) { if (border_style == BS_NORMAL) {
result = (Rect){border_width, 0, -(2 * border_width), -(border_width)}; result = (Rect){border_width, 0, -(2 * border_width), -(border_width)};
} else { } else {
result = (Rect){border_width, border_width, -(2 * border_width), -(2 * border_width)}; result = (Rect){border_width, border_width, -(2 * border_width), -(2 * border_width)};
} }
/* Floating windows are never adjacent to any other window, so borders_to_hide = con_adjacent_borders(con) & config.hide_edge_borders;
don’t hide their border(s). This prevents bug #998. */
if (con_is_floating(con))
return result;
if (borders_to_hide & ADJ_LEFT_SCREEN_EDGE) { if (borders_to_hide & ADJ_LEFT_SCREEN_EDGE) {
result.x -= border_width; result.x -= border_width;
result.width += border_width; result.width += border_width;
@ -1280,6 +1275,11 @@ Rect con_border_style_rect(Con *con) {
*/ */
adjacent_t con_adjacent_borders(Con *con) { adjacent_t con_adjacent_borders(Con *con) {
adjacent_t result = ADJ_NONE; adjacent_t result = ADJ_NONE;
/* Floating windows are never adjacent to any other window, so
don’t hide their border(s). This prevents bug #998. */
if (con_is_floating(con))
return result;
Con *workspace = con_get_workspace(con); Con *workspace = con_get_workspace(con);
if (con->rect.x == workspace->rect.x) if (con->rect.x == workspace->rect.x)
result |= ADJ_LEFT_SCREEN_EDGE; result |= ADJ_LEFT_SCREEN_EDGE;