From 3409929a0ced975d79e9353a3fa5dfa366e2d297 Mon Sep 17 00:00:00 2001
From: Takase <20792268+takase1121@users.noreply.github.com>
Date: Mon, 10 Oct 2022 23:05:30 +0800
Subject: [PATCH] draw lite-xl icon in TitleView (#1143)

the original hamburger menu icon is confusing. It is not a menu
and clicking it doesn't do anything. There is no reason why
we can't draw lite-xl's icon in place of that.
---
 data/core/titleview.lua      |  14 ++++++-
 data/fonts/icons.ttf         | Bin 10036 -> 10516 bytes
 scripts/fontello-config.json |  70 +++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/data/core/titleview.lua b/data/core/titleview.lua
index f9d7a961..f31d73e5 100644
--- a/data/core/titleview.lua
+++ b/data/core/titleview.lua
@@ -3,6 +3,14 @@ local common = require "core.common"
 local style = require "core.style"
 local View = require "core.view"
 
+local icon_colors = {
+  bg = { common.color "#2e2e32ff" },
+  color6 = { common.color "#e1e1e6ff" },
+  color7 = { common.color "#ffa94dff" },
+  color8 = { common.color "#93ddfaff" },
+  color9 = { common.color "#f7c95cff" }
+};
+
 local restore_command = {
   symbol = "w", action = function() system.set_window_mode("normal") end
 }
@@ -55,7 +63,11 @@ function TitleView:draw_window_title()
   local ox, oy = self:get_content_offset()
   local color = style.text
   local x, y = ox + style.padding.x, oy + style.padding.y
-  x = common.draw_text(style.icon_font, color, "M ", nil, x, y, 0, h)
+  common.draw_text(style.icon_font, icon_colors.bg, "5", nil, x, y, 0, h)
+  common.draw_text(style.icon_font, icon_colors.color6, "6", nil, x, y, 0, h)
+  common.draw_text(style.icon_font, icon_colors.color7, "7", nil, x, y, 0, h)
+  common.draw_text(style.icon_font, icon_colors.color8, "8", nil, x, y, 0, h)
+  x = common.draw_text(style.icon_font, icon_colors.color9, "9 ", nil, x, y, 0, h)
   local title = core.compose_window_title(core.window_title)
   common.draw_text(style.font, color, title, nil, x, y, 0, h)
 end
diff --git a/data/fonts/icons.ttf b/data/fonts/icons.ttf
index 43ab376735b7a7a4355a91dacd639d4dcc8d285e..5fd6d9e9cc85ad0c24ecbc32cada5a97ee255a0c 100644
GIT binary patch
delta 1284
zcmZvbe`r%z6vxlGH+ip(X`Zi5^73NQB(KzAQc2RJT9Gw01+h$5+CdcyHEGkNTVjKT
z+HJUiAc$-*eIf&8j3E|9*k;@x{^K9wKa)-T*FQv%4a)xV4;Ar8>$&MI7V%v^Ip=)e
zz31L@-p$SZ=SP1G*R%OK02~2;!&8-9^{empCn)|MfbX1|uZ7%OR+0e06upnlREw2-
z;`O%_9|rKai@9S}(l=5ZBim9ee?8;BKXe7au|#sHRLD(7rkwu(_*&?FUx@_u4u48<
zhT^VLrM7TjVq)b#5~fKgmFK2%i5ES?6#p$2RB{VdjCgJV_#G67j^rwZKRvZ)6n6oz
ztJS$<wSWJ*p#TIP(4h}ij~1#kgTGw@_@sRH<w5S?KiFU3p7HB&ftDlj{$b=g2~LR9
z(+2oP&Urzqm>nbQYU&QSM{xu~G><_TqR<2V_7Yl{wq2~>64@hiYy&a2L%cbXAVvyO
zcAiDseBcKI0$|bt#n!oHH<&l;a4ITws8wtR8{BR5D;|&5Y_3jjdq-0NuP~HE<XHch
zl<TDZ3sW_>ka4$sY1+T?t@SiT0@1`iiKu;tgc=AtB`Vo|iTG+Flc1IOR3eT!DA_<Z
zD-nASNkkE!tx^XMIr}736pTpd>cE&plsPVGCwo95DxZ{y@~0&}vNIAt*`mZCJ1Y@Q
zIu2CQadOPYdB-1E|B^59QP3ce@iC;&b_x*Z8Msu?n8sCqv?HAK`*g2jg(KZ*J=HhH
z2d#MAdUHFHNbphVM1;6{UD!jGg?8AS*+h4e(lJCf4vgU>Aj8jlyDYAnQB0@0qo{l9
zo3S_C^dsH)y{V6N#yc?|&|m2$hF<A`<)29y(@k?-at2z)O^4k}Rm^Wh)revk*~8^W
zXtC__BT}1pn_Xm1P{dqB7#4G_=G^oav}m(urGXQ=8OPHn21<1Q)-U?V2A07tE-o_X
zVq-wr+t&Hbz}uclZTEA~IQ_Q)9?#}P)0@`5+_A$73Y{;lJjVjH;iT|C#QwiyBn8VD
z!$F+DD&A!Q_LT49=lB!HkkjS7;Jl|Kl?mmH@<h$3H(SK*5QPOBd2cIX(k}b1VX|TP
wlZZik*x2Sm0|RJc5I5O1qdPWREA%Xs^Tn3(s+U-El50+C&FO9YWL(nT0U;^PNdN!<

delta 806
zcmXw%O=uHA6vyA}Zn8~HvT3t1t+q5JHO4eT(t~;^Qd+@)t&|$t3QF0e`4AGjG@+?l
ztSET$V3{H!9=uqz7m-y^5QKskp*N4klR{`cNTpElBfhtp&hXpE|Nq|3yxE=Ai8mJ?
z_AU<@e*xGy08D1fhM9PNA&UA1fV7=msD|7<jRAm;H0I-Zvrx_?f8RoV2f*tt7!?zJ
zAL>zzErrsJy!zSy4?tPP{EuSJnC(8gauvXj^>C_)hPol|pniwCuUM`wPN%*!zN4{)
zM!GbYHI9`|WB~L8>Uh~$G+DRzJ?bl{L)VRR?ya}-3-uB<_|lxKRPTi{Qvg9~I&9A8
z%>3}HrvQ-$EBlvaCf9hHogbTkNBBBJn!|xXM&gKqiEWYlhAvgbF}B*i0@P^;C)PnP
z^utNM%fdV;o#|n=PdS=>5V2<zXvQGM=cRsJ&dHN<m~Tq@2rfWF0ovZFw%7{5g*zPr
zaHI5io1R9&2W{=(ZyMsM<6296Nb+b@4eTJP^AGaz<w2ALb$V7nTMY}G7^w+DMa~JR
z5&D0G3mFq&UqJVQzy{%xfcC~uZsWl?-DDJ~`xyZpVOD?_1oDD5j0HhE#%lsPXicC4
zSasz!vo_TcPgj@EU7OJc_dt{DSO8m}*1jG@9uJ(>0_4l}#vaSzrMS!Q2gai;#%@cK
z(lcpaPRZ+vsr+#y9FH9vj-Sqyb4@*>F4$i$V6`50F_z?daGfQskHG=P0(`e4#v`2(
J>t^Q@?LP>cg_{5X

diff --git a/scripts/fontello-config.json b/scripts/fontello-config.json
index 42334c2f..76349182 100644
--- a/scripts/fontello-config.json
+++ b/scripts/fontello-config.json
@@ -125,6 +125,76 @@
       "css": "right-open",
       "code": 62,
       "src": "fontawesome"
+    },
+    {
+      "uid": "ebf4bfe82c54f9beb94c5221a7bdd975",
+      "css": "lite-xlbg",
+      "code": 53,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M83.3 0H916.7C962.7 0 1000 37.3 1000 83.3V916.7C1000 962.7 962.7 1000 916.7 1000H83.3C37.3 1000 0 962.7 0 916.7V83.3C0 37.3 37.3 0 83.3 0Z",
+        "width": 1000
+      },
+      "search": [
+        "lite-xlbg"
+      ]
+    },
+    {
+      "uid": "cde50fad6c2cd7a805a8d5026939d645",
+      "css": "lite-xl1",
+      "code": 54,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M395.8 562.5V312.5C395.8 289.5 377.2 270.8 354.2 270.8H270.8V625C270.8 682.5 317.5 729.2 375 729.2H729.2V645.8C729.2 622.8 710.5 604.2 687.5 604.2H437.5C414.5 604.2 395.8 585.5 395.8 562.5Z",
+        "width": 1000
+      },
+      "search": [
+        "lite-xl1"
+      ]
+    },
+    {
+      "uid": "526539ec7fcda0b3e7e7ceaa6ae416e6",
+      "css": "lite-xl2",
+      "code": 55,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M729.2 270.8H437.5L729.2 562.5Z",
+        "width": 1000
+      },
+      "search": [
+        "lite-xl2"
+      ]
+    },
+    {
+      "uid": "cccbe047c5cb17c63c41a1fb1fc022f4",
+      "css": "lite-xl3",
+      "code": 57,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M666.7 333.3H500L666.7 500Z",
+        "width": 1000
+      },
+      "search": [
+        "lite-xl3"
+      ]
+    },
+    {
+      "uid": "09d781dca1f50fcae90e67df9cc2f8dd",
+      "css": "lite-xl4",
+      "code": 56,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M500 458.3V333.3L604.2 395.8 666.7 500H541.7C518.7 500 500 481.3 500 458.3Z",
+        "width": 1000
+      },
+      "search": [
+        "lite-xl4"
+      ]
     }
   ]
 }
\ No newline at end of file