Merge pull request #877 from jgmdev/statusview-commands

StatusView: added ability to hide and commands

data/core/command.lua

@@ -64,7 +64,7 @@ end
 function command.add_defaults()
   local reg = {
     "core", "root", "command", "doc", "findreplace",
-    "files", "drawwhitespace", "dialog", "log"
+    "files", "drawwhitespace", "dialog", "log", "statusbar"
   }
   for _, name in ipairs(reg) do
     require("core.commands." .. name)

data/core/commands/statusbar.lua

@@ -0,0 +1,71 @@
+local core = require "core"
+local command = require "core.command"
+local common = require "core.common"
+local style = require "core.style"
+local StatusView = require "core.statusview"
+
+local function status_view_item_names()
+  local items = core.status_view:get_items_list()
+  local names = {}
+  for _, item in ipairs(items) do
+    table.insert(names, item.name)
+  end
+  return names
+end
+
+local function status_view_items_data(names)
+  local data = {}
+  for _, name in ipairs(names) do
+    local item = core.status_view:get_item(name)
+    table.insert(data, {
+      text = command.prettify_name(item.name),
+      info = item.alignment == StatusView.Item.LEFT and "Left" or "Right",
+      name = item.name
+    })
+  end
+  return data
+end
+
+local function status_view_get_items(text)
+  local names = status_view_item_names()
+  local results = common.fuzzy_match(names, text)
+  results = status_view_items_data(results)
+  return results
+end
+
+command.add(nil, {
+  ["status-bar:toggle"] = function()
+    core.status_view:toggle()
+  end,
+  ["status-bar:show"] = function()
+    core.status_view:show()
+  end,
+  ["status-bar:hide"] = function()
+    core.status_view:hide()
+  end,
+  ["status-bar:disable-messages"] = function()
+    core.status_view:display_messages(false)
+  end,
+  ["status-bar:enable-messages"] = function()
+    core.status_view:display_messages(true)
+  end,
+  ["status-bar:hide-item"] = function()
+    core.command_view:enter("Status bar item to hide",
+      function(text, item)
+        core.status_view:hide_items(item.name)
+      end,
+      status_view_get_items
+    )
+  end,
+  ["status-bar:show-item"] = function()
+    core.command_view:enter("Status bar item to show",
+      function(text, item)
+        core.status_view:show_items(item.name)
+      end,
+      status_view_get_items
+    )
+  end,
+  ["status-bar:reset-items"] = function()
+    core.status_view:show_items()
+  end,
+})

data/core/statusview.lua

@@ -163,6 +163,7 @@ function StatusView:new()
   self.dragged_panel = ""
   self.hovered_panel = ""
   self.hide_messages = false
+  self.visible = true
 
   self:register_docview_items()
   self:register_command_items()
@@ -340,6 +341,24 @@ function StatusView:get_items_list(alignment)
 end
 
 
+---Hide the status bar
+function StatusView:hide()
+  self.visible = false
+end
+
+
+---Show the status bar
+function StatusView:show()
+  self.visible = true
+end
+
+
+---Toggle the visibility of the status bar
+function StatusView:toggle()
+  self.visible = not self.visible
+end
+
+
 ---Hides the given items from the status view or all if no names given.
 ---@param names table<integer, string> | string | nil
 function StatusView:hide_items(names)
@@ -383,7 +402,7 @@ end
 ---@param icon_color renderer.color
 ---@param text string
 function StatusView:show_message(icon, icon_color, text)
-  if self.hide_messages then return end
+  if not self.visible or self.hide_messages then return end
   self.message = {
     icon_color, style.icon_font, icon,
     style.dim, style.font, StatusView.separator2, style.text, text
@@ -833,6 +852,7 @@ end
 
 
 function StatusView:on_mouse_pressed(button, x, y, clicks)
+  if not self.visible then return end
   core.set_active_view(core.last_active_view)
   if
     system.get_time() < self.message_timeout
@@ -843,7 +863,11 @@ function StatusView:on_mouse_pressed(button, x, y, clicks)
   else
     if y >= self.position.y and button == "left" and clicks == 1 then
       self.position.dx = x
-      if self.r_left_width > self.left_width then
+      if
+        self.r_left_width > self.left_width
+        or
+        self.r_right_width > self.right_width
+      then
         self.dragged_panel = self:get_hovered_panel(x, y)
         self.cursor = "hand"
       end
@@ -854,6 +878,7 @@ end
 
 
 function StatusView:on_mouse_moved(x, y, dx, dy)
+  if not self.visible then return end
   StatusView.super.on_mouse_moved(self, x, y, dx, dy)
 
   self.hovered_panel = self:get_hovered_panel(x, y)
@@ -896,6 +921,7 @@ end
 
 
 function StatusView:on_mouse_released(button, x, y)
+  if not self.visible then return end
   StatusView.super.on_mouse_released(self, button, x, y)
 
   if self.dragged_panel ~= "" then
@@ -922,12 +948,26 @@ end
 
 
 function StatusView:on_mouse_wheel(y)
+  if not self.visible then return end
   self:drag_panel(self.hovered_panel, y * self.left_width / 10)
 end
 
 
 function StatusView:update()
-  self.size.y = style.font:get_height() + style.padding.y * 2
+  if not self.visible and self.size.y <= 0 then
+    return
+  elseif not self.visible and self.size.y > 0 then
+    self:move_towards(self.size, "y", 0)
+    return
+  end
+
+  local height = style.font:get_height() + style.padding.y * 2;
+
+  if self.size.y + 1 < height then
+    self:move_towards(self.size, "y", height)
+  else
+    self.size.y = height
+  end
 
   if system.get_time() < self.message_timeout then
     self.scroll.to.y = self.size.y
@@ -957,6 +997,8 @@ end
 
 
 function StatusView:draw()
+  if not self.visible and self.size.y <= 0 then return end
+
   self:draw_background(style.background2)
 
   if self.message and system.get_time() <= self.message_timeout then