From dcb29efce58ce0e122806b7f352a9f682e2fcbd8 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 6 Sep 2024 15:10:01 +0300 Subject: Implement by-id window addressing in IPC and CLI, fix move-column-to-workspace This is a JSON-breaking change for the IPC actions that changed from unit variants to struct variants. Unfortunately, I couldn't find a way with serde to both preserve a single variant, and make it serialize to the old value when the new field is None. I don't think anyone is using these actions from JSON at the moment, so this breaking change is fine. --- src/handlers/xdg_shell.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/handlers') diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs index 48c798aa..80dd2262 100644 --- a/src/handlers/xdg_shell.rs +++ b/src/handlers/xdg_shell.rs @@ -119,10 +119,8 @@ impl XdgShellHandler for State { self.niri.layout.toggle_full_width(); } if intersection.intersects(ResizeEdge::TOP_BOTTOM) { - // FIXME: don't activate once we can pass specific windows to actions. - self.niri.layout.activate_window(&window); self.niri.layer_shell_on_demand_focus = None; - self.niri.layout.reset_window_height(); + self.niri.layout.reset_window_height(Some(&window)); } // FIXME: granular. self.niri.queue_redraw_all(); -- cgit