walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 17 Wiki Activity

Merge branch 'lite-xl:master' into lite-xl-windows-dark-theme-title-bar-support

This commit is contained in:
Nikolai Sinyov 2021-11-23 11:33:51 +03:00 committed by GitHub
parent 7342f8c389 955acf53a3
commit 567d18ad61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/plugins/language_js.lua
View File

@ -11,8 +11,8 @@ syntax.add {
{ pattern = { '"', '"', '\\' }, type = "string" },
{ pattern = { "'", "'", '\\' }, type = "string" },
{ pattern = { "`", "`", '\\' }, type = "string" },
{ pattern = "0x[%da-fA-F]+", type = "number" },
{ pattern = "-?%d+[%d%.eE]*", type = "number" },
{ pattern = "0x[%da-fA-F_]+n?", type = "number" },
{ pattern = "-?%d+[%d%.eE_n]*", type = "number" },
{ pattern = "-?%.?%d+", type = "number" },
{ pattern = "[%+%-=/%*%^%%<>!~|&]", type = "operator" },
{ pattern = "[%a_][%w_]*%f[(]", type = "function" },

13
data/plugins/treeview.lua
View File

@ -295,6 +295,12 @@ function TreeView:draw_tooltip()
end
function TreeView:color_for_item(abs_filename)
-- other plugins can override this to customize the color of each icon
return nil
end
function TreeView:draw()
self:draw_background(style.background2)
@ -318,6 +324,9 @@ function TreeView:draw()
color = style.accent
end
-- allow for color overrides
local icon_color = self:color_for_item(item.abs_filename) or color
-- icons
x = x + item.depth * style.padding.x + style.padding.x
if item.type == "dir" then
@ -325,11 +334,11 @@ function TreeView:draw()
local icon2 = item.expanded and "D" or "d"
common.draw_text(style.icon_font, color, icon1, nil, x, y, 0, h)
x = x + style.padding.x
common.draw_text(style.icon_font, color, icon2, nil, x, y, 0, h)
common.draw_text(style.icon_font, icon_color, icon2, nil, x, y, 0, h)
x = x + icon_width
else
x = x + style.padding.x
common.draw_text(style.icon_font, color, "f", nil, x, y, 0, h)
common.draw_text(style.icon_font, icon_color, "f", nil, x, y, 0, h)
x = x + icon_width
end