diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-06-20 18:54:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 18:54:01 -0700 |
| commit | 47c7674a68ca6adfd0b8151d62c3afae32d69577 (patch) | |
| tree | 2a9bb715b221822b132b9713dc6d49eefb3e0fd3 | |
| parent | 0e3b35c87e32099aace65f7b7607e4d556324d30 (diff) | |
| parent | a59774f364306f2535832e630d9577039d7beac8 (diff) | |
Merge pull request #1075 from emersion/fix-xdg-toplevel-compare
xdg-shell{,-v6}: fix compare_xdg_surface_toplevel_state
| -rw-r--r-- | types/xdg_shell/wlr_xdg_toplevel.c | 2 | ||||
| -rw-r--r-- | types/xdg_shell_v6/wlr_xdg_toplevel_v6.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/types/xdg_shell/wlr_xdg_toplevel.c b/types/xdg_shell/wlr_xdg_toplevel.c index fa0ec929..c1350931 100644 --- a/types/xdg_shell/wlr_xdg_toplevel.c +++ b/types/xdg_shell/wlr_xdg_toplevel.c @@ -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 configured.state = state->current; configured.width = state->base->surface->current->width; - configured.height = state->base->surface->current->width; + configured.height = state->base->surface->current->height; } else { struct wlr_xdg_surface_configure *configure = wl_container_of(state->base->configure_list.prev, configure, link); diff --git a/types/xdg_shell_v6/wlr_xdg_toplevel_v6.c b/types/xdg_shell_v6/wlr_xdg_toplevel_v6.c index 0f9a26d3..e2e1e480 100644 --- a/types/xdg_shell_v6/wlr_xdg_toplevel_v6.c +++ b/types/xdg_shell_v6/wlr_xdg_toplevel_v6.c @@ -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 configured.state = state->current; configured.width = state->base->surface->current->width; - configured.height = state->base->surface->current->width; + configured.height = state->base->surface->current->height; } else { struct wlr_xdg_surface_v6_configure *configure = wl_container_of(state->base->configure_list.prev, configure, link); |