Merge remote-tracking branch 'upstream'

1 files changed, 17 insertions, 5 deletions

diff --git a/config/hypr/lua/user_keybinds_helper.lua b/config/hypr/lua/user_keybinds_helper.lua
index f9d4aa0c..66398bd9 100644
--- a/config/hypr/lua/user_keybinds_helper.lua
+++ b/config/hypr/lua/user_keybinds_helper.lua
@@ -125,14 +125,26 @@ local function dispatch(name, args)
   if name == "exec" then
     return exec_cmd(args)
   end
-  if name == "killactive" and window_api.close then
-    return window_api.close()
+  if name == "killactive" then
+    if window_api.close then
+      return window_api.close()
+    end
+    if window_api.kill then
+      return window_api.kill()
+    end
+    return raw_dispatch_cmd("killactive")
   end
-  if name == "fullscreen" and window_api.fullscreen then
+  if name == "fullscreen" then
+    if window_api.fullscreen then
+      if args == "1" then
+        return window_api.fullscreen({ mode = "maximized" })
+      end
+      return window_api.fullscreen({ mode = "fullscreen" })
+    end
     if args == "1" then
-      return window_api.fullscreen({ mode = "maximized" })
+      return exec_cmd("hyprctl dispatch 'hl.dsp.window.fullscreen({ mode = \"maximized\" })'")
     end
-    return window_api.fullscreen({ mode = "fullscreen" })
+    return exec_cmd("hyprctl dispatch 'hl.dsp.window.fullscreen({ mode = \"fullscreen\" })'")
   end
   if name == "movefocus" and dsp and dsp.focus then
     return function()