diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-10-10 00:46:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-10 00:46:15 +0200 |
commit | ab6423f9b9d2d647e82316bb092971c3455c88cc (patch) | |
tree | 8dfec300d61a3c77e31096b466ebd11627c1d039 | |
parent | Merge pull request #2805 from RyanDwyer/fix-resize-return-value (diff) | |
parent | Fix undesirable height change of floating views (diff) | |
download | sway-ab6423f9b9d2d647e82316bb092971c3455c88cc.tar.gz sway-ab6423f9b9d2d647e82316bb092971c3455c88cc.tar.zst sway-ab6423f9b9d2d647e82316bb092971c3455c88cc.zip |
Merge pull request #2809 from mwenzkowski/fix-view_autoconfigure
Fix undesirable height change of floating views
-rw-r--r-- | sway/tree/view.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 1f00452d..e613ac0b 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -243,10 +243,10 @@ void view_autoconfigure(struct sway_view *view) { | |||
243 | // title area. We have to offset the surface y by the height of the title, | 243 | // title area. We have to offset the surface y by the height of the title, |
244 | // bar, and disable any top border because we'll always have the title bar. | 244 | // bar, and disable any top border because we'll always have the title bar. |
245 | enum sway_container_layout layout = container_parent_layout(con); | 245 | enum sway_container_layout layout = container_parent_layout(con); |
246 | if (layout == L_TABBED) { | 246 | if (layout == L_TABBED && !container_is_floating(con)) { |
247 | y_offset = container_titlebar_height(); | 247 | y_offset = container_titlebar_height(); |
248 | view->border_top = false; | 248 | view->border_top = false; |
249 | } else if (layout == L_STACKED) { | 249 | } else if (layout == L_STACKED && !container_is_floating(con)) { |
250 | list_t *siblings = container_get_siblings(con); | 250 | list_t *siblings = container_get_siblings(con); |
251 | y_offset = container_titlebar_height() * siblings->length; | 251 | y_offset = container_titlebar_height() * siblings->length; |
252 | view->border_top = false; | 252 | view->border_top = false; |