Merge pull request #521 from adamharrison/remove-font-renderer

Remove Font Renderer + CP Replace + libagg

data/plugins/drawwhitespace.lua

@@ -0,0 +1,32 @@
+-- mod-version:2 -- lite-xl 2.0
+
+local style = require "core.style"
+local DocView = require "core.docview"
+local common = require "core.common"
+
+local draw_line_text = DocView.draw_line_text
+
+function DocView:draw_line_text(idx, x, y)
+  local font = (self:get_font() or style.syntax_fonts["comment"])
+  local color = style.syntax.comment
+  local ty, tx = y + self:get_line_text_y_offset()
+  local text, offset, s, e = self.doc.lines[idx], 1
+  while true do
+    s, e = text:find(" +", offset)
+    if not s then break end
+    tx = self:get_col_x_offset(idx, s) + x
+    renderer.draw_text(font, string.rep("·", e - s + 1), tx, ty, color)
+    offset = e + 1
+  end
+  offset = 1
+  while true do
+    s, e = text:find("\t", offset)
+    if not s then break end
+    tx = self:get_col_x_offset(idx, s) + x
+    renderer.draw_text(font, "»", tx, ty, color)
+    offset = e + 1
+  end
+  draw_line_text(self, idx, x, y)
+end
+
+

data/plugins/lineguide.lua

@@ -7,8 +7,7 @@ local draw_overlay = DocView.draw_overlay
 
 function DocView:draw_overlay(...)
   local ns = ("n"):rep(config.line_limit)
-  local ss = self:get_font():subpixel_scale()
-  local offset = self:get_font():get_width_subpixel(ns) / ss
+  local offset = self:get_font():get_width(ns)
   local x = self:get_line_screen_position(1) + offset
   local y = self.position.y
   local w = math.ceil(SCALE * 1)

data/plugins/scale.lua

@@ -44,10 +44,10 @@ local function set_scale(scale)
     style.tab_width      = style.tab_width      * s
 
     for _, name in ipairs {"font", "big_font", "icon_font", "icon_big_font", "code_font"} do
-      renderer.font.set_size(style[name], s * style[name]:get_size())
+      style[name] = renderer.font.copy(style[name], s * style[name]:get_size())
     end
   else
-    renderer.font.set_size(style.code_font, s * style.code_font:get_size())
+    style.code_font = renderer.font.copy(style.code_font, s * style.code_font:get_size())
   end
 
   for _, font in pairs(style.syntax_fonts) do