tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

change way in set background color, compat with text node

Browse Source
This commit is contained in:
王劲鹏
2021-04-08 17:37:10 +08:00
committed by osborn
parent 5c5d6165c2
commit b8440d9fb7
7 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doric-Qt/doric/shader/DoricTextNode.cpp
View File

@@ -19,16 +19,16 @@ QQuickItem *DoricTextNode::build() {
void DoricTextNode::blend(QQuickItem *view, QString name, QJsonValue prop) {
if (name == "text") {
view->childItems().at(0)->setProperty("text", prop.toString());
view->setProperty("text", prop.toString());
} else if (name == "textColor") {
QString color = DoricUtils::doricColor(prop.toInt()).name();
view->childItems().at(0)->setProperty("color", color);
view->setProperty("color", color);
} else if (name == "textSize") {
QFont font = view->childItems().at(0)->property("font").value<QFont>();
QFont font = view->property("font").value<QFont>();
font.setPixelSize(prop.toInt());
view->childItems().at(0)->setProperty("font", QVariant(font));
view->setProperty("font", QVariant(font));
} else if (name == "textAlignment") {
view->childItems().at(0)->setProperty("textAlignment", prop.toInt());
view->setProperty("textAlignment", prop.toInt());
} else {
DoricViewNode::blend(view, name, prop);
}

2
doric-Qt/doric/shader/DoricViewNode.cpp
View File

@@ -108,7 +108,7 @@ void DoricViewNode::blend(QQuickItem *view, QString name, QJsonValue prop) {
}
} else if (name == "backgroundColor") {
QString color = DoricUtils::doricColor(prop.toInt()).name();
view->setProperty("color", color);
view->setProperty("backgroundColor", color);
} else if (name == "x") {
view->setProperty("x", prop.toInt());
} else if (name == "y") {