diff options
author | emersion <contact@emersion.fr> | 2018-11-28 21:05:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-28 21:05:59 +0100 |
commit | 9d18d81d484c0e6c5ee3638bc69f1dae53299ba4 (patch) | |
tree | a1dfd5de6c8337e5a7fd570b587ae18009873eea | |
parent | Merge pull request #3214 from RedSoxFan/fix-3156 (diff) | |
parent | Fix titlebar when no title or marks (diff) | |
download | sway-9d18d81d484c0e6c5ee3638bc69f1dae53299ba4.tar.gz sway-9d18d81d484c0e6c5ee3638bc69f1dae53299ba4.tar.zst sway-9d18d81d484c0e6c5ee3638bc69f1dae53299ba4.zip |
Merge pull request #3216 from RedSoxFan/fix-empty-titlebars
Fix titlebar when no title or marks
-rw-r--r-- | sway/desktop/render.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index eeda496c..ca8ef83b 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
@@ -555,7 +555,12 @@ static void render_titlebar(struct sway_output *output, | |||
555 | 555 | ||
556 | // Determine the left + right extends of the textures (output-buffer local) | 556 | // Determine the left + right extends of the textures (output-buffer local) |
557 | int ob_left_x, ob_left_width, ob_right_x, ob_right_width; | 557 | int ob_left_x, ob_left_width, ob_right_x, ob_right_width; |
558 | if (ob_title_x < ob_marks_x) { | 558 | if (ob_title_width == 0 && ob_marks_width == 0) { |
559 | ob_left_x = ob_inner_x; | ||
560 | ob_left_width = 0; | ||
561 | ob_right_x = ob_inner_x; | ||
562 | ob_right_width = 0; | ||
563 | } else if (ob_title_x < ob_marks_x) { | ||
559 | ob_left_x = ob_title_x; | 564 | ob_left_x = ob_title_x; |
560 | ob_left_width = ob_title_width; | 565 | ob_left_width = ob_title_width; |
561 | ob_right_x = ob_marks_x; | 566 | ob_right_x = ob_marks_x; |