Add built in float option for win_split_mode

Author: kristijanhusak

DOCS.md

@@ -75,12 +75,14 @@ NOTE: Make sure fast access keys do not overlap. If that happens, first entry in
 Should error diagnostics be shown. If you are using Neovim 0.6.0 or higher, these will be shown via `vim.diagnostic`.<br />
 
 #### **win_split_mode**
-*type*: `string|function`<br />
+*type*: `string|function|table`<br />
 *default value*: `horizontal`<br />
 Available options:
-* horizontal - Always split horizontally
-* vertical - Always split vertically
-* auto - Determine between horizontal and vertical split depending on the current window size
+* `horizontal` - Always split horizontally
+* `vertical` - Always split vertically
+* `auto` - Determine between horizontal and vertical split depending on the current window size
+* `float` - Open in float window that has width of 70% of the screen centered
+* `{'float', 0.9}` - Open in float window and provide custom scale (in this case it's 90% of screen size), must be value between `0` and `1`
 
 This option determines how to open agenda and capture window.<br />
 If none of the options above suit your needs, you can provide custom command string (see `:help <mods>`) or custom function:

lua/orgmode/capture/init.lua

@@ -68,13 +68,15 @@ end
 ---@param template table
 function Capture:open_template(template)
   local content = self.templates:compile(template)
+  local winnr = vim.api.nvim_get_current_win()
   utils.open_window(vim.fn.tempname(), 16, config.win_split_mode)
   vim.cmd([[setf org]])
   vim.cmd([[setlocal bufhidden=wipe nobuflisted nolist noswapfile nofoldenable]])
   vim.api.nvim_buf_set_lines(0, 0, -1, true, content)
   self.templates:setup()
   vim.api.nvim_buf_set_var(0, 'org_template', template)
   vim.api.nvim_buf_set_var(0, 'org_capture', true)
+  vim.api.nvim_buf_set_var(0, 'org_prev_window', winnr)
   config:setup_mappings('capture')
 
   self.wipeout_autocmd_id = vim.api.nvim_create_autocmd('BufWipeout', {
@@ -320,7 +322,11 @@ function Capture:kill()
     vim.api.nvim_del_autocmd(self.wipeout_autocmd_id)
     self.wipeout_autocmd_id = nil
   end
-  return vim.api.nvim_win_close(0, true)
+  local prev_winnr = vim.api.nvim_buf_get_var(0, 'org_prev_window')
+  vim.api.nvim_win_close(0, true)
+  if prev_winnr and vim.api.nvim_win_is_valid(prev_winnr) then
+    vim.api.nvim_set_current_win(prev_winnr)
+  end
 end
 
 return Capture

lua/orgmode/utils/init.lua

@@ -513,6 +513,7 @@ end
 
 ---@param name string
 ---@param height number
+---@param split_mode string|function|table
 function utils.open_window(name, height, split_mode)
   local cmd_by_split_mode = {
     horizontal = string.format('%dsplit %s', height, name),
@@ -522,7 +523,10 @@ function utils.open_window(name, height, split_mode)
   if cmd_by_split_mode[split_mode] then
     vim.cmd(cmd_by_split_mode[split_mode])
     vim.w.org_window_split_mode = split_mode
-  elseif split_mode == 'auto' then
+    return
+  end
+
+  if split_mode == 'auto' then
     local winwidth = utils.winwidth()
     if (winwidth / 2) >= 80 then
       vim.cmd(cmd_by_split_mode.vertical)
@@ -531,13 +535,47 @@ function utils.open_window(name, height, split_mode)
       vim.cmd(cmd_by_split_mode.horizontal)
       vim.w.org_window_split_mode = 'horizontal'
     end
-  else
-    if type(split_mode) == 'function' then
-      split_mode(name)
-    else
-      vim.cmd(string.format('%s %s', split_mode, name))
-    end
+    return
+  end
+
+  if type(split_mode) == 'function' then
+    return split_mode(name)
   end
+
+  if split_mode == 'float' then
+    return utils.open_float(name)
+  end
+
+  if type(split_mode) == 'table' and split_mode[1] == 'float' then
+    return utils.open_float(name, split_mode[2])
+  end
+
+  return vim.cmd(string.format('%s %s', split_mode, name))
+end
+
+---@param name string
+---@param scale? number
+function utils.open_float(name, scale)
+  scale = scale or 0.7
+  -- Make sure number is between 0 and 1
+  scale = math.min(math.max(0, scale), 1)
+  local bufnr = vim.api.nvim_create_buf(false, true)
+  vim.api.nvim_buf_set_name(bufnr, name)
+
+  local width = math.floor((vim.o.columns * scale))
+  local height = math.floor((vim.o.lines * scale))
+  local row = math.floor((((vim.o.lines - height) / 2) - 1))
+  local col = math.floor(((vim.o.columns - width) / 2))
+
+  vim.api.nvim_open_win(bufnr, true, {
+    relative = 'editor',
+    width = width,
+    height = height,
+    row = row,
+    col = col,
+    style = 'minimal',
+    border = 'rounded',
+  })
 end
 
 return utils