From a59774f364306f2535832e630d9577039d7beac8 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Wed, 20 Jun 2018 21:25:01 +0100
Subject: [PATCH] xdg-shell{,-v6}: fix compare_xdg_surface_toplevel_state
---
types/xdg_shell/wlr_xdg_toplevel.c | 2 +-
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);