aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-06-24 21:02:40 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-06-24 21:02:40 +0000
commit20c0650dfdfb64c17499e04665f491a6871d4917 (patch)
treebc25a02b9f992907bf36785328ff87f33f7e0def
parentchangelog: spelling; add missing ‘l’ in ‘experimental’ (diff)
wayland: regression: properly instantiate CSDs when there’s no decoration manager
* Set win->configure.csd_mode, not win->csd_mode. Otherwise our ‘configure’ handler will swap out the CSD_YES we set, for CSD_UNKNOWN(?), resulting in no CSDs at all. * Don’t instantiate the CSDs in wayl_win_init(), let the ‘configure’ event handler do that. Just like it does when we have a decoration manager emitting decoration configure events.
-rw-r--r--wayland.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/wayland.c b/wayland.c
index 301760d8..80fef88a 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1384,8 +1384,7 @@ wayl_win_init(struct terminal *term)
win->xdg_toplevel_decoration, &xdg_toplevel_decoration_listener, win);
} else {
/* No decoration manager - thus we *must* draw our own decorations */
- win->csd_mode = CSD_YES;
- csd_instantiate(win);
+ win->configure.csd_mode = CSD_YES;
LOG_WARN("no decoration manager available - using CSDs unconditionally");
}