xdg-toplevel: don't send maximized if tiled is requested but not supported

This is a bit too magical and may break compositors which try not to
send duplicate configure events.
master
Kirill Primak 1 year ago
parent af165acb42
commit 5fac9b1beb

@ -78,8 +78,7 @@ struct wlr_xdg_toplevel_configure *send_xdg_toplevel_configure(
if (configure->activated) { if (configure->activated) {
states[nstates++] = XDG_TOPLEVEL_STATE_ACTIVATED; states[nstates++] = XDG_TOPLEVEL_STATE_ACTIVATED;
} }
if (configure->tiled) { if (configure->tiled && version >= XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) {
if (version >= XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) {
const struct { const struct {
enum wlr_edges edge; enum wlr_edges edge;
enum xdg_toplevel_state state; enum xdg_toplevel_state state;
@ -96,13 +95,8 @@ struct wlr_xdg_toplevel_configure *send_xdg_toplevel_configure(
} }
states[nstates++] = tiled[i].state; states[nstates++] = tiled[i].state;
} }
} else if (!configure->maximized) {
states[nstates++] = XDG_TOPLEVEL_STATE_MAXIMIZED;
}
} }
if (configure->suspended && version >= XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION) {
if (configure->suspended &&
version >= XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION) {
states[nstates++] = XDG_TOPLEVEL_STATE_SUSPENDED; states[nstates++] = XDG_TOPLEVEL_STATE_SUSPENDED;
} }
assert(nstates <= sizeof(states) / sizeof(states[0])); assert(nstates <= sizeof(states) / sizeof(states[0]));

Loading…
Cancel
Save