Revert "reduce nesting in commitnotify()"

This reverts commit c824886b8c.
This commit is contained in:
Guido Cella
2026-09-15 15:24:27 +02:00
parent c824886b8c
commit 68c6319e3f
+5 -4
View File
@@ -933,9 +933,7 @@ commitnotify(struct wl_listener *listener, void *data)
{ {
Client *c = wl_container_of(listener, c, commit); Client *c = wl_container_of(listener, c, commit);
if (!c->surface.xdg->initial_commit) if (c->surface.xdg->initial_commit) {
return;
/* /*
* Get the monitor this client will be rendered on * Get the monitor this client will be rendered on
* Note that if the user set a rule in which the client is placed on * Note that if the user set a rule in which the client is placed on
@@ -943,8 +941,9 @@ commitnotify(struct wl_listener *listener, void *data)
* a wrong monitor. * a wrong monitor.
*/ */
applyrules(c); applyrules(c);
if (c->mon) if (c->mon) {
client_set_scale(client_surface(c), c->mon->wlr_output->scale); client_set_scale(client_surface(c), c->mon->wlr_output->scale);
}
setmon(c, NULL, 0); /* Make sure to reapply rules in mapnotify() */ setmon(c, NULL, 0); /* Make sure to reapply rules in mapnotify() */
wlr_xdg_toplevel_set_wm_capabilities(c->surface.xdg->toplevel, wlr_xdg_toplevel_set_wm_capabilities(c->surface.xdg->toplevel,
@@ -955,6 +954,8 @@ commitnotify(struct wl_listener *listener, void *data)
if (!c->isfloating) if (!c->isfloating)
client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT |
WLR_EDGE_RIGHT); WLR_EDGE_RIGHT);
return;
}
} }
void void