blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1075 from emersion/fix-xdg-toplevel-compare 

xdg-shell{,-v6}: fix compare_xdg_surface_toplevel_state
This commit is contained in:
Drew DeVault 2018-06-20 18:54:01 -07:00 committed by GitHub
parent 0e3b35c87e a59774f364
commit 47c7674a68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
types/xdg_shell/wlr_xdg_toplevel.c
View File

@ -40,7 +40,7 @@ bool compare_xdg_surface_toplevel_state(struct wlr_xdg_toplevel *state) {
// last configure is actually the current state, just use it // last configure is actually the current state, just use it
configured.state = state->current; configured.state = state->current;
configured.width = state->base->surface->current->width; configured.width = state->base->surface->current->width;
configured.height = state->base->surface->current->width; configured.height = state->base->surface->current->height;
} else { } else {
struct wlr_xdg_surface_configure *configure = struct wlr_xdg_surface_configure *configure =
wl_container_of(state->base->configure_list.prev, configure, link); wl_container_of(state->base->configure_list.prev, configure, link);

2
types/xdg_shell_v6/wlr_xdg_toplevel_v6.c
View File

@ -288,7 +288,7 @@ bool compare_xdg_surface_v6_toplevel_state(struct wlr_xdg_toplevel_v6 *state) {
// last configure is actually the current state, just use it // last configure is actually the current state, just use it
configured.state = state->current; configured.state = state->current;
configured.width = state->base->surface->current->width; configured.width = state->base->surface->current->width;
configured.height = state->base->surface->current->width; configured.height = state->base->surface->current->height;
} else { } else {
struct wlr_xdg_surface_v6_configure *configure = struct wlr_xdg_surface_v6_configure *configure =
wl_container_of(state->base->configure_list.prev, configure, link); wl_container_of(state->base->configure_list.prev, configure, link);