alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2004 from RyanDwyer/rebuild-textures-on-move

Browse source 
Rebuild textures if needed when moving a container
This commit is contained in:
emersion 2018-05-19 14:54:57 +01:00 committed by GitHub
parent c2c5a3f5f6 9fd28aea8c
commit 90ca0c8b2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/tree/container.h
View file

@ -98,6 +98,8 @@ struct sway_container {
// Passed the previous parent // Passed the previous parent
struct wl_signal reparent; struct wl_signal reparent;
} events; } events;
struct wl_listener reparent;
}; };
struct sway_container *container_create(enum sway_container_type type); struct sway_container *container_create(enum sway_container_type type);

41
sway/tree/container.c
View file

@ -73,6 +73,44 @@ static void container_close_notify(struct sway_container *container) {
} }
} }
static void container_update_textures_recursive(struct sway_container *con) {
container_update_title_textures(con);
if (con->type == C_VIEW) {
view_update_marks_textures(con->sway_view);
} else {
for (int i = 0; i < con->children->length; ++i) {
struct sway_container *child = con->children->items[i];
container_update_textures_recursive(child);
}
}
}
static void handle_reparent(struct wl_listener *listener,
void *data) {
struct sway_container *container =
wl_container_of(listener, container, reparent);
struct sway_container *old_parent = data;
struct sway_container *old_output = old_parent;
if (old_output != NULL && old_output->type != C_OUTPUT) {
old_output = container_parent(old_output, C_OUTPUT);
}
struct sway_container *new_output = container->parent;
if (new_output != NULL && new_output->type != C_OUTPUT) {
new_output = container_parent(new_output, C_OUTPUT);
}
if (old_output && new_output) {
float old_scale = old_output->sway_output->wlr_output->scale;
float new_scale = new_output->sway_output->wlr_output->scale;
if (old_scale != new_scale) {
container_update_textures_recursive(container);
}
}
}
struct sway_container *container_create(enum sway_container_type type) { struct sway_container *container_create(enum sway_container_type type) {
// next id starts at 1 because 0 is assigned to root_container in layout.c // next id starts at 1 because 0 is assigned to root_container in layout.c
static size_t next_id = 1; static size_t next_id = 1;
@ -92,6 +130,9 @@ struct sway_container *container_create(enum sway_container_type type) {
wl_signal_init(&c->events.destroy); wl_signal_init(&c->events.destroy);
wl_signal_init(&c->events.reparent); wl_signal_init(&c->events.reparent);
wl_signal_add(&c->events.reparent, &c->reparent);
c->reparent.notify = handle_reparent;
return c; return c;
} }