From 1d4667b3472e6e5b802270db40703ac38c17c8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= <jingpeng.wang@outlook.com>
Date: Wed, 26 May 2021 15:47:44 +0800
Subject: [PATCH] add icon font support (except for res)

---
 doric-Qt/example/app/qml.qrc                  |   4 ++++
 .../example/app/resources/assets_iconfont.ttf | Bin 0 -> 2108 bytes
 doric-Qt/example/doric/resources/text.qml     |   9 ++++++++
 .../example/doric/shader/DoricTextNode.cpp    |  20 ++++++++++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 doric-Qt/example/app/resources/assets_iconfont.ttf

diff --git a/doric-Qt/example/app/qml.qrc b/doric-Qt/example/app/qml.qrc
index 8347b124..e83c096e 100644
--- a/doric-Qt/example/app/qml.qrc
+++ b/doric-Qt/example/app/qml.qrc
@@ -3,6 +3,10 @@
         <file>main.qml</file>
         <file>test-layout.qml</file>
         <file>qtquickcontrols2.conf</file>
+        <file alias="iconfont.ttf">../../../doric-demo/bundle/iconfont.ttf</file>
+    </qresource>
+    <qresource prefix="/fonts">
+        <file alias="assets_iconfont.ttf">./resources/assets_iconfont.ttf</file>
     </qresource>
     <qresource prefix="/doric/bundles">
         <file alias="Counter.js">../../../doric-demo/bundle/src/Counter.js</file>
diff --git a/doric-Qt/example/app/resources/assets_iconfont.ttf b/doric-Qt/example/app/resources/assets_iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6ea00a93968c042413b0fded35f6c6d7e1b29ecb
GIT binary patch
literal 2108
zcmd^APiP!f9RA+S?##|c+N9~m9@;XSq&aBVY&L(?nrcinQ7F2!Yd{cmx|!Wg+1*(t
z)6zhM1@Yji5j+IVAvZw;BZ8-bIeJjYp&*E@Jw-(dUc5-V@q2IHVod~lcXr?JeZTL0
zzu)`4w{PD-0O&y*Ch`lHUZ30Ue0dKLPm`T{?b29b=98C)=&#XVEH}K?&u@Hnj{c8q
zt!jO>^5;*tJ_XDYV9eBfZ|TGf-*60f*`{kG>^tVW#5dW7YmMl7ih!}VXj1i{?1|IT
zH!sjw4exqO4B%IepP=tHy@vl>sq+qyTxb49D_Ds(Ha_zhDubQ@Yd72bZM>O~K4|4?
z9)1kPkiBUPzw*}6nLp4IYk&A)?iVSH`~7wT#tphD7&=^LGH@Gd<x4iL@cu*NX`IF=
z#EbJ6N{oyX$2Exha@A91$~=N&a#WBJuoRMML;_+RNu-STjc@7Sh<ouH3W7^CkTj+2
z@Kdb3w1nBc@xAeQ{bn0&s`TpRRJxcXq0BKFQ=+6buacGOQTALR`2+@)h9v=e<NI7^
zZ0X0fL&(bi@6Tgu15WB~P<thJioV)?b)LDS`b3pb!y4A{AvUmyEqnp_&nXN%o;hv}
z$<}w=8XTGG8|s@V44e|m$!4+=li+xEaAb0NB0H6pL+8Zg^s{10nm*~pOkp6Cot#b{
zNJqicQ;*1<8Olt^M!o9$lW{S6_A}F&<OF9`RsC0Qwk=0EHa|z4e9Ly&J%E|F9ey4A
zzALS{et(C&WA{2X2_-V_IuE{|jl;HWXZK%W2gRb;Di(K(#m?Ks;=K6Sl1X=DQt^@1
z+1`?~9%x%)CuJQ|1$2H_%HGZ{=a$fQY$@kg6-F*^J0dUHSU`fz-*IZ}Q5ZLV#K}#^
z5^9B;#^9Qo#brEan3Z-m#xWlss$;klpC!7P?ztk9qNmOnF9sW@G&ac(Yn&kFeWcPP
zd8<!qY>|In<20Vcg2p}QM<{QCgu|F8@Ses3z4%;X14r<+#wPjiG)@rT);Ng)+|$@X
zuP`-EV^Q>L+=CIZoIW4=UgR&imsj28a?q><%_!Xk7yathx)*lcZolY<E6YLC9na;v
z)Pmpi!)~6HYt=#&RoqG#G~9V6^y~G&ZH2)VzZ~UiQPes+HYO*Me6Accc;TJrvVC}n
zXqVvPGFEAqQAU6!D#}LG9b_(2U&U3_85<rNJ*Zx!I>ZWfGOLSm<d8oUwLn!<DG%1O
zf@_?uz$zow<g$g#)F7JI75c2CPVAzk#;!0=nd%&`9U0ZaS&Z@1T~Sw`Q!8!AgVKH9
f#qT+FbpBxsVet1nTJ*xG<~M_8$#1mkzLNX}jz=d{

literal 0
HcmV?d00001

diff --git a/doric-Qt/example/doric/resources/text.qml b/doric-Qt/example/doric/resources/text.qml
index 6290c455..af97dfa7 100644
--- a/doric-Qt/example/doric/resources/text.qml
+++ b/doric-Qt/example/doric/resources/text.qml
@@ -6,6 +6,8 @@ import "util.mjs" as Util
 import "gravity.mjs" as Gravity
 
 TextArea {
+    FontLoader { id: webFont }
+
     property var wrapper
 
     property var uuid: Util.uuidv4()
@@ -21,6 +23,13 @@ TextArea {
 
     property int textAlignment: 0
 
+    property var fontSource: ""
+
+    onFontSourceChanged: {
+        webFont.source = fontSource
+        font.family = webFont.name
+    }
+
     property var fontStyle: ""
 
     onFontStyleChanged: {
diff --git a/doric-Qt/example/doric/shader/DoricTextNode.cpp b/doric-Qt/example/doric/shader/DoricTextNode.cpp
index 870bf417..69f6584b 100644
--- a/doric-Qt/example/doric/shader/DoricTextNode.cpp
+++ b/doric-Qt/example/doric/shader/DoricTextNode.cpp
@@ -50,6 +50,26 @@ void DoricTextNode::blend(QQuickItem *view, QString name, QJsonValue prop) {
     view->setProperty("lineCount", prop.toInt());
   } else if (name == "fontStyle") {
     view->setProperty("fontStyle", prop.toString());
+  } else if (name == "font") {
+    QString font = prop.toString();
+    QString fontPath = "";
+    QString fontName = font;
+
+    if (font.contains("/")) {
+      int separatorIndex = font.lastIndexOf("/");
+      fontPath = QStringRef(&font, 0, separatorIndex + 1).toString();
+      fontName = QStringRef(&font, separatorIndex + 1,
+                            font.length() - separatorIndex - 1)
+                     .toString();
+    }
+
+    if (fontName.endsWith(".ttf")) {
+      fontName = fontName.replace(".ttf", "");
+    }
+
+    QString path = "qrc:/" + fontPath + fontName + ".ttf";
+
+    view->setProperty("fontSource", path);
   } else if (name == "shadow") {
     view->setProperty("shadowColor", QVariant::fromValue(DoricUtils::doricColor(
                                          prop["color"].toInt())));