Merge pull request #2809 from mwenzkowski/fix-view_autoconfigure

Fix undesirable height change of floating views
This commit is contained in:
Drew DeVault 2018-10-10 00:46:15 +02:00 committed by GitHub
commit ab6423f9b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -243,10 +243,10 @@ void view_autoconfigure(struct sway_view *view) {
// 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.
enum sway_container_layout layout = container_parent_layout(con); enum sway_container_layout layout = container_parent_layout(con);
if (layout == L_TABBED) { if (layout == L_TABBED && !container_is_floating(con)) {
y_offset = container_titlebar_height(); y_offset = container_titlebar_height();
view->border_top = false; view->border_top = false;
} else if (layout == L_STACKED) { } else if (layout == L_STACKED && !container_is_floating(con)) {
list_t *siblings = container_get_siblings(con); list_t *siblings = container_get_siblings(con);
y_offset = container_titlebar_height() * siblings->length; y_offset = container_titlebar_height() * siblings->length;
view->border_top = false; view->border_top = false;