mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-31 07:11:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1640 from taiyu-len/fix_remove_view_from_scratchpad

Browse source 
fix remove_view_from_scratchpad
This commit is contained in:
Drew DeVault 2018-03-28 16:58:56 -04:00 • committed by GitHub
commit 0c8bc0264a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/commands.c
View file

@ -141,12 +141,12 @@ void remove_view_from_scratchpad(swayc_t *view) {
int i; int i;
for (i = 0; i < scratchpad->length; i++) { for (i = 0; i < scratchpad->length; i++) {
if (scratchpad->items[i] == view) { if (scratchpad->items[i] == view) {
list_del(scratchpad, sp_index);
if (sp_index == 0) { if (sp_index == 0) {
sp_index = scratchpad->length - 1; sp_index = scratchpad->length - 1;
} else { } else {
sp_index--; sp_index--;
} }
list_del(scratchpad, sp_index);
sp_view = NULL; sp_view = NULL;
} }
} }

3
sway/container.c
View file

@ -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) { void update_visibility_output(swayc_t *container, wlc_handle output) {
// Inherit visibility // Inherit visibility
swayc_t *parent = container->parent; swayc_t *parent = container->parent;
if (parent == NULL) {
return;
}
container->visible = parent->visible; container->visible = parent->visible;
// special cases where visibility depends on focus // special cases where visibility depends on focus
if (parent->type == C_OUTPUT || parent->layout == L_TABBED || if (parent->type == C_OUTPUT || parent->layout == L_TABBED ||

5
sway/debug_log.c
View file

@ -71,6 +71,11 @@ void layout_log(const swayc_t *c, int depth) {
layout_log(c->floating->items[i], depth + 1); layout_log(c->floating->items[i], depth + 1);
} }
} }
} else if (c->type == C_ROOT && scratchpad->length > 0) {
fprintf(stderr, "ScratchPad\n");
for (i = 0; i < scratchpad->length; ++i) {
container_log(scratchpad->items[i], 0);
}
} }
} }