Bugfix: Add deco_height only when in "normal" border mode.
Also, use con_border_style_rect instead of hard-coded values to determine the border size.
This commit is contained in:
parent
506b7f4004
commit
9d9a1d9d29
|
@ -175,11 +175,15 @@ void floating_enable(Con *con, bool automatic) {
|
|||
nc->rect.width = max(nc->rect.width, config.floating_minimum_width);
|
||||
}
|
||||
|
||||
/* add pixels for the decoration */
|
||||
/* TODO: don’t add them when the user automatically puts new windows into
|
||||
* 1pixel/borderless mode */
|
||||
nc->rect.height += deco_height + 2;
|
||||
nc->rect.width += 4;
|
||||
/* Add pixels for the decoration. */
|
||||
Rect border_style_rect = con_border_style_rect(con);
|
||||
|
||||
nc->rect.height -= border_style_rect.height;
|
||||
nc->rect.width -= border_style_rect.width;
|
||||
|
||||
/* Add some more pixels for the title bar */
|
||||
if(con_border_style(con) == BS_NORMAL)
|
||||
nc->rect.height += deco_height;
|
||||
|
||||
/* Honor the X11 border */
|
||||
nc->rect.height += con->border_width * 2;
|
||||
|
|
Loading…
Reference in New Issue