From e058985bf34774cc790bc92a6b3141e50d93c39c Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Sat, 21 Jan 2023 14:02:38 +0800
Subject: [PATCH] fix: fix wrap height caculate mistake

---
 lua/Trans/content.lua    |  6 ++++--
 lua/Trans/init.lua       |  7 ++++---
 lua/Trans/translate.lua  |  1 +
 lua/Trans/view/hover.lua |  5 +++--
 lua/Trans/window.lua     | 18 ++----------------
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/lua/Trans/content.lua b/lua/Trans/content.lua
index ba2f31f..db57a43 100644
--- a/lua/Trans/content.lua
+++ b/lua/Trans/content.lua
@@ -58,8 +58,9 @@ local content = {
         self.window:bufset('modifiable', false)
     end,
 
-    actual_height = function(self)
-        if self.window:option('wrap') then
+    actual_height = function(self, wrap)
+        wrap = wrap or self.window:option('wrap')
+        if  wrap then
             local height = 0
             local width = self.window.width
             local lines = self.lines
@@ -67,6 +68,7 @@ local content = {
                 height = height + math.max(1, (math.ceil(lines[i]:width() / width)))
             end
             return height
+
         else
             return self.size
         end
diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua
index 8570d4d..3a70bac 100644
--- a/lua/Trans/init.lua
+++ b/lua/Trans/init.lua
@@ -19,9 +19,9 @@ M.conf = {
             -- TODO :
             pageup = '[[',
             pagedown = ']]',
-            pin = '+',
-            close = '_',
-            toggle_entry = '--',
+            pin = '<leader>[',
+            close = '<leader>]',
+            toggle_entry = '<leader>;',
         },
         animation = {
             -- open = 'fold',
@@ -77,6 +77,7 @@ M.conf = {
         -- yes = '',
         -- no = ''
     },
+
     db_path = '$HOME/.vim/dict/ultimate.db',
 
     -- TODO :
diff --git a/lua/Trans/translate.lua b/lua/Trans/translate.lua
index 152c2dd..94e5ee5 100644
--- a/lua/Trans/translate.lua
+++ b/lua/Trans/translate.lua
@@ -31,6 +31,7 @@ local function get_word(mode)
     end
 end
 
+
 local function translate(mode, view)
     vim.validate {
         mode = { mode, 's', true },
diff --git a/lua/Trans/view/hover.lua b/lua/Trans/view/hover.lua
index 60cf74b..07218e0 100644
--- a/lua/Trans/view/hover.lua
+++ b/lua/Trans/view/hover.lua
@@ -283,15 +283,16 @@ return function(word)
         end
     else
         process.failed()
+        m_window:set_width(m_content.lines[1]:width())
     end
 
-    m_window:draw(true)
+    m_window:draw()
+    m_window.height = m_content:actual_height(true)
     m_window:open(function()
         m_window:set('wrap', true)
     end)
 
 
-
     -- Auto Close
     cmd_id = api.nvim_create_autocmd(
         hover.auto_close_events, {
diff --git a/lua/Trans/window.lua b/lua/Trans/window.lua
index 3820d0e..000a478 100644
--- a/lua/Trans/window.lua
+++ b/lua/Trans/window.lua
@@ -83,24 +83,10 @@ local window = {
 
     ---**第一次**绘制窗口的内容
     ---@param self table 窗口的对象
-    ---@param adjust boolean 是否需要调整窗口的高度和宽度 (只有窗口只有一行时才会调整宽度)
-    draw = function(self, adjust)
+    draw = function(self)
         -- TODO :
-        if self.title then
-            self.title:attach()
-        end
+        self.title:attach()
         self.content:attach()
-
-        if adjust then
-            local height = self.content:actual_height() + self.title:actual_height()
-            if self.height > height then
-                self:set_height(height)
-            end
-
-            if self.content.size == 1 and self.title.size == 0 then
-                self:set_width(self.content.lines[1]:width())
-            end
-        end
     end,
 
     open = function(self, callback)