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

add x & y & spacing; render try catch; remove rectangle layer in qml

Browse Source
This commit is contained in:
王劲鹏 2021-02-24 15:47:57 +08:00 committed by osborn
parent 850d6321a0
commit d35c8d2118
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doric-Qt/doric/doric.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.14.0, 2021-02-24T10:31:57. --> <!-- Written by QtCreator 4.14.0, 2021-02-24T14:48:39. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

24
doric-Qt/doric/plugin/DoricShaderPlugin.cpp
View File

@ -6,18 +6,22 @@
void DoricShaderPlugin::render(QJSValue jsValue, QString callbackId) { void DoricShaderPlugin::render(QJSValue jsValue, QString callbackId) {
getContext()->getDriver()->asyncCall( getContext()->getDriver()->asyncCall(
[this, jsValue] { [this, jsValue] {
QString viewId = jsValue.property("id").toString(); try {
DoricRootNode *rootNode = getContext()->getRootNode(); QString viewId = jsValue.property("id").toString();
DoricRootNode *rootNode = getContext()->getRootNode();
if (rootNode->getId().isEmpty() && if (rootNode->getId().isEmpty() &&
jsValue.property("type").toString() == "Root") { jsValue.property("type").toString() == "Root") {
rootNode->setId(viewId); rootNode->setId(viewId);
rootNode->blend(jsValue.property("props")); rootNode->blend(jsValue.property("props"));
} else { } else {
DoricViewNode *viewNode = getContext()->targetViewNode(viewId); DoricViewNode *viewNode = getContext()->targetViewNode(viewId);
if (viewNode != nullptr) { if (viewNode != nullptr) {
viewNode->blend(jsValue.property("props")); viewNode->blend(jsValue.property("props"));
}
} }
} catch (...) {
qCritical() << "render exception";
} }
}, },
DoricThreadMode::UI); DoricThreadMode::UI);

5
doric-Qt/doric/resources/hlayout.qml
View File

@ -1,9 +1,6 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Controls 2.5 import QtQuick.Controls 2.5
Rectangle { Row {
Row {
}
} }

3
doric-Qt/doric/resources/stack.qml
View File

@ -2,7 +2,4 @@ import QtQuick 2.12
import QtQuick.Controls 2.5 import QtQuick.Controls 2.5
Rectangle { Rectangle {
StackView {
}
} }

3
doric-Qt/doric/resources/view.qml
View File

@ -2,7 +2,4 @@ import QtQuick 2.12
import QtQuick.Controls 2.5 import QtQuick.Controls 2.5
Rectangle { Rectangle {
StackView {
}
} }

5
doric-Qt/doric/resources/vlayout.qml
View File

@ -1,9 +1,6 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Controls 2.5 import QtQuick.Controls 2.5
Rectangle { Column {
Column {
}
} }

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

@ -47,5 +47,13 @@ void DoricViewNode::blend(QQuickItem *view, QString name, QJSValue prop) {
} else if (name == "backgroundColor") { } else if (name == "backgroundColor") {
QString color = DoricUtils::doricColor(prop.toNumber()).name(); QString color = DoricUtils::doricColor(prop.toNumber()).name();
view->setProperty("color", color); view->setProperty("color", color);
} else if (name == "x") {
view->setProperty("x", prop.toInt());
} else if (name == "y") {
view->setProperty("y", prop.toInt());
} else if (name == "space") {
view->setProperty("spacing", prop.toInt());
} else {
qCritical() << name << ": " << prop.toString();
} }
} }