diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2018-03-27 21:34:55 -0700 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2018-03-27 21:34:55 -0700 |
| commit | 0ccf55ef60b8f210cc6dc67b2dc2649043ebc231 (patch) | |
| tree | 8de6a857f201e695f383a7a61ebddf9dd6b9b592 | |
| parent | f72415b48fdf390c8a8a5dec95c88ae3fe028cad (diff) | |
fix remove_view_from_scratchpad
| -rw-r--r-- | sway/commands.c | 2 | ||||
| -rw-r--r-- | sway/container.c | 3 | ||||
| -rw-r--r-- | sway/debug_log.c | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/sway/commands.c b/sway/commands.c index c7dbf731..fb3653a2 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -141,12 +141,12 @@ void remove_view_from_scratchpad(swayc_t *view) { int i; for (i = 0; i < scratchpad->length; i++) { if (scratchpad->items[i] == view) { + list_del(scratchpad, sp_index); if (sp_index == 0) { sp_index = scratchpad->length - 1; } else { sp_index--; } - list_del(scratchpad, sp_index); sp_view = NULL; } } diff --git a/sway/container.c b/sway/container.c index 829fde69..9fb044a7 100644 --- a/sway/container.c +++ b/sway/container.c @@ -869,6 +869,9 @@ void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), voi void update_visibility_output(swayc_t *container, wlc_handle output) { // Inherit visibility swayc_t *parent = container->parent; + if (parent == NULL) { + return; + } container->visible = parent->visible; // special cases where visibility depends on focus if (parent->type == C_OUTPUT || parent->layout == L_TABBED || diff --git a/sway/debug_log.c b/sway/debug_log.c index d1eafae8..5cc5f9dc 100644 --- a/sway/debug_log.c +++ b/sway/debug_log.c @@ -72,6 +72,11 @@ void layout_log(const swayc_t *c, int depth) { } } } + if (c->type == C_ROOT) { + fprintf(stderr,"ScratchPad\n"); + for (int i = 0; i < scratchpad->length; ++i) + container_log(scratchpad->items[i], 0); + } } const char *swayc_type_string(enum swayc_types type) { |