diff options
author | emersion <contact@emersion.fr> | 2018-10-20 22:52:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-20 22:52:56 +0200 |
commit | 3f02218b54645a68a7496eb15b7bb16d26b75ae2 (patch) | |
tree | 55fe01811bc8ac0785ce9798335bfd15553fa708 /swaybar/bar.c | |
parent | Merge pull request #2900 from Hi-Angel/master (diff) | |
parent | swaybar: render with minimum height, nominally text height (diff) | |
download | sway-3f02218b54645a68a7496eb15b7bb16d26b75ae2.tar.gz sway-3f02218b54645a68a7496eb15b7bb16d26b75ae2.tar.zst sway-3f02218b54645a68a7496eb15b7bb16d26b75ae2.zip |
Merge pull request #2901 from ianyfan/swaybar1.0-beta.1
swaybar: render with minimum height, nominally text height
Diffstat (limited to 'swaybar/bar.c')
-rw-r--r-- | swaybar/bar.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c index fa761925..71aff691 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | static void bar_init(struct swaybar *bar) { | 29 | static void bar_init(struct swaybar *bar) { |
30 | bar->config = init_config(); | 30 | bar->config = init_config(); |
31 | bar->visible = true; | ||
32 | wl_list_init(&bar->outputs); | 31 | wl_list_init(&bar->outputs); |
33 | } | 32 | } |
34 | 33 | ||
@@ -227,9 +226,6 @@ static void xdg_output_handle_done(void *data, | |||
227 | 226 | ||
228 | output->surface = wl_compositor_create_surface(bar->compositor); | 227 | output->surface = wl_compositor_create_surface(bar->compositor); |
229 | assert(output->surface); | 228 | assert(output->surface); |
230 | if (bar->visible) { | ||
231 | add_layer_surface(output); | ||
232 | } | ||
233 | } | 229 | } |
234 | } | 230 | } |
235 | 231 | ||
@@ -377,10 +373,15 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) { | |||
377 | pointer->cursor_surface = wl_compositor_create_surface(bar->compositor); | 373 | pointer->cursor_surface = wl_compositor_create_surface(bar->compositor); |
378 | assert(pointer->cursor_surface); | 374 | assert(pointer->cursor_surface); |
379 | 375 | ||
376 | bar->visible = true; | ||
380 | if (bar->config->workspace_buttons) { | 377 | if (bar->config->workspace_buttons) { |
381 | if (ipc_get_workspaces(bar)) { | 378 | ipc_get_workspaces(bar); |
382 | set_bar_dirty(bar); | 379 | } |
380 | if (determine_bar_visibility(bar, false)) { | ||
381 | wl_list_for_each(output, &bar->outputs, link) { | ||
382 | add_layer_surface(output); | ||
383 | } | 383 | } |
384 | set_bar_dirty(bar); | ||
384 | } | 385 | } |
385 | return true; | 386 | return true; |
386 | } | 387 | } |