Merge branch 'master' into dev

data/core/config.lua

@@ -24,6 +24,7 @@ config.animation_rate = 1.0
 config.blink_period = 0.8
 config.draw_whitespace = false
 config.borderless = false
+config.tab_close_button = true
 
 -- Disable plugin loading setting to false the config entry
 -- of the same name.

data/core/rootview.lua

@@ -295,7 +295,7 @@ function Node:tab_hovered_update(px, py)
   if tab_index then
     local x, y, w, h = self:get_tab_rect(tab_index)
     local cx, cw = close_button_location(x, w)
-    if px >= cx and px < cx + cw and py >= y and py < y + h then
+    if px >= cx and px < cx + cw and py >= y and py < y + h and config.tab_close_button then
       self.hovered_close = tab_index
     end
   else
@@ -529,7 +529,7 @@ function Node:draw_tabs()
       renderer.draw_rect(x - ds, y, ds, h, style.divider)
     end
     local cx, cw, cspace = close_button_location(x, w)
-    local show_close_button = (view == self.active_view or i == self.hovered_tab)
+    local show_close_button = ((view == self.active_view or i == self.hovered_tab) and config.tab_close_button)
     if show_close_button then
       local close_style = self.hovered_close == i and style.text or style.dim
       common.draw_text(style.icon_font, close_style, "C", nil, cx, y, 0, h)

data/plugins/scale.lua

@@ -32,6 +32,9 @@ local function set_scale(scale)
   local s = scale / current_scale
   current_scale = scale
 
+  -- we set scale_level in case this was called by user
+  scale_level = (scale - default_scale) / scale_steps
+
   if config.scale_mode == "ui" then
     SCALE = scale
 
@@ -58,7 +61,7 @@ local function set_scale(scale)
   core.redraw = true
 end
 
-local function get_scale() 
+local function get_scale()
   return current_scale
 end
 
@@ -101,9 +104,9 @@ keymap.add {
   ["ctrl+="] = "scale:increase",
 }
 
-return { 
-  ["set"] = set_scale, 
-  ["get"] = get_scale, 
+return {
+  ["set"] = set_scale,
+  ["get"] = get_scale,
   ["increase"] = inc_scale,
   ["decrease"] = dec_scale,
   ["reset"] = res_scale