Merge pull request #70 from Isrothy/focus-fix

Focus fix
Isrothy · Aug 9, 2024 · fc3f1da · fc3f1da
2 parents ffb02f0 + c62c86c
commit fc3f1da
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -236,7 +236,8 @@ Notice that a minimap is shown if and only if
 | `Neominimap winToggle [window_list]`  | Toggle the minimap for specified windows. If no windows are specified, toggle for the current window.   | Optional: List of windows |
 | `Neominimap winRefresh [window_list]` | Refresh the minimap for specified windows. If no windows are specified, refresh for the current window. | Optional: List of windows |
 | `Neominimap focus`                    | Focus on the minimap. Set cursor to the minimap window.                                                 | None                      |
-| `Neominimap blur`                     | Unfocus the minimap. Set cursor back.                                                                   | None                      |
+| `Neominimap unfocus`                  | Unfocus the minimap. Set cursor back.                                                                   | None                      |
+| `Neominimap toggleFocus`              | Toggle minimap focus                                                                                    | None                      |
 
 ### Usage Examples
 
@@ -277,7 +278,8 @@ These are the corresponding commands in the Lua API.
 | `Neominimap winToggle [args]`  | Toggles the minimap for specified windows.   | `require('neominimap').winToggle({"3", "4"})`  |
 | `Neominimap winRefresh [args]` | Refreshes the minimap for specified windows. | `require('neominimap').winRefresh({"3", "4"})` |
 | `Neominimap focus`             | Focuses the minimap.                         | `require('neominimap').focus()`                |
-| `Neominimap unfocus`           | Unfocuses the minimap.                       | `require('neominimap').unfocus()`              |`
+| `Neominimap unfocus`           | Unfocuses the minimap.                       | `require('neominimap').unfocus()`              |
+| `Neominimap toggleFocus`       | Toggle minimap focus.                        | `require('neominimap').toggleFocus()`          |
 
 ## How it works
 

diff --git a/lua/neominimap.lua b/lua/neominimap.lua
@@ -86,10 +86,18 @@ M.focus = function(args, opts)
     require("neominimap.command.focus").subcommand_tbl.focus.impl(args, opts)
 end
 
+---@param args string[]
+---@param opts table
 M.unfocus = function(args, opts)
     require("neominimap.command.focus").subcommand_tbl.unfocus.impl(args, opts)
 end
 
+---@param args string[]
+---@param opts table
+M.toggleFocus = function(args, opts)
+    require("neominimap.command.focus").subcommand_tbl.toggleFocus.impl(args, opts)
+end
+
 M.setup = function()
     local gid = api.nvim_create_augroup("Neominimap", { clear = true })
 

diff --git a/lua/neominimap/command/focus.lua b/lua/neominimap/command/focus.lua
@@ -4,21 +4,45 @@ local logger = require("neominimap.logger")
 
 local M = {}
 
+---@param winid integer
+local focus = function(winid)
+    if not window.focus(winid) then
+        logger.notify("Minimap can not be focused for current window", vim.log.levels.ERROR)
+    end
+end
+
+---@param mwinid integer
+local unfocus = function(mwinid)
+    if not window.unfocus(mwinid) then
+        logger.notify("Minimap can not be unfocused for current window", vim.log.levels.ERROR)
+    end
+end
+
 ---@type table<string, Neominimap.Subcommand>
 M.subcommand_tbl = {
     focus = {
         impl = function(args, opts)
             local winid = api.nvim_get_current_win()
-            if not window.focus(winid) then
-                logger.notify("Minimap can not be focused for current window", vim.log.levels.ERROR)
+            if not window.is_minimap_window(winid) then
+                focus(winid)
             end
         end,
     },
     unfocus = {
         impl = function(args, opts)
             local winid = api.nvim_get_current_win()
-            if not window.unfocus(winid) then
-                logger.notify("Minimap can not be unfocused for current window", vim.log.levels.ERROR)
+            if window.is_minimap_window(winid) then
+                unfocus(winid)
+            end
+        end,
+    },
+    toggleFocus = {
+        impl = function(args, opts)
+            local winid = api.nvim_get_current_win()
+            if window.is_minimap_window(winid) then
+                unfocus(winid)
+            else
+                focus(winid)
             end
         end,
     },