refactor: replace conf.window with conf.hover and conf.float

lua/Trans/init.lua

@@ -6,7 +6,6 @@ M.conf = {
         n = 'hover',
         v = 'hover',
     },
-    window = {
     -- animation = true,
     hover = {
         width = 36,
@@ -17,6 +16,12 @@ M.conf = {
             { ' Trans', 'TransTitle' },
             { '', 'TransTitleRound' },
         },
+        keymap = {
+            -- TODO :
+            pageup = '[[',
+            pagedown = ']]',
+        },
+        animation = 13,
     },
     float = {
         width = 0.8,
@@ -27,9 +32,11 @@ M.conf = {
             { ' Trans', 'TransTitle' },
             { '', 'TransTitleRound' },
         },
+        keymap = {
+            quit = 'q',
         },
+        animation = 9,
     },
-
     order = {
         -- offline = {
         'title',
@@ -56,13 +63,6 @@ M.conf = {
         -- no = ''
     },
     db_path = '$HOME/.vim/dict/ultimate.db',
-    keymap = {
-        -- TODO :
-        hover = {
-            pageup = '[[',
-            pagedown = ']]',
-        },
-    },
 
     -- TODO :
     -- engine = {
@@ -86,13 +86,15 @@ M.setup = function(opts)
     if opts then
         M.conf = vim.tbl_deep_extend('force', M.conf, opts)
     end
-    local window = M.conf.window
+    local hover = M.conf.hover
-    assert(window.hover.width > 1 and window.hover.height > 1)
+    local float = M.conf.float
-    assert(0 < window.float.width and window.float.width <= 1)
-    assert(0 < window.float.height and window.float.height <= 1)
 
-    window.float.height = math.floor((vim.o.lines - vim.o.cmdheight - 1) * window.float.height)
+    assert(hover.width > 1 and hover.height > 1)
-    window.float.width = math.floor(vim.o.columns * window.float.width)
+    assert(0 < float.width and float.width <= 1)
+    assert(0 < float.height and float.height <= 1)
+
+    float.height = math.floor((vim.o.lines - vim.o.cmdheight - 1) * float.height)
+    float.width = math.floor(vim.o.columns * float.width)
 
     M.translate = require('Trans.translate')
     require("Trans.setup")

lua/Trans/view/float.lua

@@ -1,5 +1,3 @@
-local conf = require('Trans').conf
-
 local m_window
 local m_result
 
@@ -8,16 +6,23 @@ return function(word)
     -- TODO :online query
     m_result    = require('Trans.query.offline')(word)
     m_window    = require('Trans.window')
-    local float    = conf.window.float
+    local float = require('Trans').conf.float
-    float.row      = math.floor((vim.o.lines - float.height) / 2)
+
-    float.col      = math.floor((vim.o.columns - float.width) / 2)
+    local opt = {
-    float.relative = 'editor'
+        relative = 'editor',
+        width    = float.width,
+        height   = float.height,
+        border   = float.border,
+        title    = float.title,
+        row      = math.floor((vim.o.lines - float.height) / 2),
+        col      = math.floor((vim.o.columns - float.width) / 2),
+    }
 
     -- 创建窗口
-    m_window.init(true, float)
+    m_window.init(true, opt)
     m_window.center('https:github.com/JuanZoran/Trans.nvim', '@text.uri') -- only show color with treesiter
     m_window.draw()
-    m_window.map('q', function ()
+    m_window.map('q', function()
-        m_window.try_close(9)
+        m_window.try_close(float.animation)
     end)
 end

lua/Trans/view/hover.lua

@@ -182,18 +182,26 @@ local action = {
 }
 
 
-return function (word)
+return function(word)
     vim.validate {
         word = { word, 's' },
     }
 
     -- 目前只处理了本地数据库的查询
     m_result    = require('Trans.query.offline')(word)
-    local hover    = conf.window.hover
+    local hover = conf.hover
-    hover.relative = 'cursor'
+    local opt = {
-    hover.col      = 2
+        relative = 'cursor',
-    hover.row      = 2
+        width    = hover.width,
-    m_window.init(false, hover)
+        height   = hover.height,
+        title    = hover.title,
+        border   = hover.border,
+        col      = 2,
+        row      = 2,
+    }
+
+
+    m_window.init(false, opt)
 
     if m_result then
         for _, field in ipairs(conf.order) do
@@ -209,15 +217,15 @@ return function (word)
         { --[[ 'InsertEnter', ]] 'CursorMoved', 'BufLeave', }, {
         buffer = 0,
         once = true,
-        callback = function ()
+        callback = function()
-            m_window.try_close(13) -- NOTE :maybe can be passed by uesr
+            m_window.try_close(hover.animation) -- NOTE :maybe can be passed by uesr
         end,
     })
 
     m_window.set('wrap', true)
     m_window.adjust()
 
-    for act, key in pairs(conf.keymap.hover) do
+    for act, key in pairs(hover.keymap) do
         vim.keymap.set('n', key, function()
             if m_window.is_open() then
                 action[act]()