aboutsummaryrefslogtreecommitdiff
path: root/data/core/docview.lua
diff options
context:
space:
mode:
Diffstat (limited to 'data/core/docview.lua')
-rw-r--r--data/core/docview.lua23
1 files changed, 8 insertions, 15 deletions
diff --git a/data/core/docview.lua b/data/core/docview.lua
index 9a2972dc..4e95c359 100644
--- a/data/core/docview.lua
+++ b/data/core/docview.lua
@@ -153,14 +153,14 @@ function DocView:get_col_x_offset(line, col)
local font = style.syntax_fonts[type] or default_font
for char in common.utf8_chars(text) do
if column == col then
- return xoffset / font:subpixel_scale()
+ return xoffset
end
- xoffset = xoffset + font:get_width_subpixel(char)
+ xoffset = xoffset + font:get_width(char)
column = column + #char
end
end
- return xoffset / default_font:subpixel_scale()
+ return xoffset
end
@@ -169,14 +169,12 @@ function DocView:get_x_offset_col(line, x)
local xoffset, last_i, i = 0, 1, 1
local default_font = self:get_font()
- local subpixel_scale = default_font:subpixel_scale()
- local x_subpixel = subpixel_scale * x + subpixel_scale / 2
for _, type, text in self.doc.highlighter:each_token(line) do
local font = style.syntax_fonts[type] or default_font
for char in common.utf8_chars(text) do
- local w = font:get_width_subpixel(char)
- if xoffset >= subpixel_scale * x then
- return (xoffset - x_subpixel > w / 2) and last_i or i
+ local w = font:get_width(char)
+ if xoffset >= x then
+ return (xoffset - x > w / 2) and last_i or i
end
xoffset = xoffset + w
last_i = i
@@ -342,16 +340,11 @@ end
function DocView:draw_line_text(idx, x, y)
local default_font = self:get_font()
- local subpixel_scale = default_font:subpixel_scale()
- local tx, ty = subpixel_scale * x, y + self:get_line_text_y_offset()
+ local tx, ty = x, y + self:get_line_text_y_offset()
for _, type, text in self.doc.highlighter:each_token(idx) do
local color = style.syntax[type]
local font = style.syntax_fonts[type] or default_font
- if config.draw_whitespace then
- tx = renderer.draw_text_subpixel(font, text, tx, ty, color, core.replacements, style.syntax.comment)
- else
- tx = renderer.draw_text_subpixel(font, text, tx, ty, color)
- end
+ tx = renderer.draw_text(font, text, tx, ty, color)
end
end