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

add target node view & set width, height

Browse Source
This commit is contained in:
王劲鹏 2021-02-23 18:26:00 +08:00 committed by osborn
parent 4c0a177747
commit 028334e530
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doric-Qt/doric/DoricContext.cpp
View File

@ -77,3 +77,10 @@ QObject *DoricContext::obtainPlugin(QString name) {
void DoricContext::setQmlEngine(QQmlEngine *engine) { mQmlEngine = engine; } void DoricContext::setQmlEngine(QQmlEngine *engine) { mQmlEngine = engine; }
QQmlEngine *DoricContext::getQmlEngine() { return mQmlEngine; } QQmlEngine *DoricContext::getQmlEngine() { return mQmlEngine; }
DoricViewNode *DoricContext::targetViewNode(QString id) {
if (id == mRootNode->getId()) {
return mRootNode;
}
return nullptr;
}

3
doric-Qt/doric/DoricContext.h
View File

@ -6,6 +6,7 @@
#include "DoricInterfaceDriver.h" #include "DoricInterfaceDriver.h"
class DoricViewNode;
class DoricRootNode; class DoricRootNode;
class DoricContext { class DoricContext {
@ -40,6 +41,8 @@ public:
void setQmlEngine(QQmlEngine *engine); void setQmlEngine(QQmlEngine *engine);
QQmlEngine *getQmlEngine(); QQmlEngine *getQmlEngine();
DoricViewNode *targetViewNode(QString id);
}; };
#endif // CONTEXT_H #endif // CONTEXT_H

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

@ -9,9 +9,15 @@ void DoricShaderPlugin::render(QJSValue jsValue, QString callbackId) {
QString viewId = jsValue.property("id").toString(); QString viewId = jsValue.property("id").toString();
DoricRootNode *rootNode = getContext()->getRootNode(); DoricRootNode *rootNode = getContext()->getRootNode();
if (rootNode->getId().isEmpty() && jsValue.property("type").toString() == "Root") { if (rootNode->getId().isEmpty() &&
jsValue.property("type").toString() == "Root") {
rootNode->setId(viewId); rootNode->setId(viewId);
rootNode->blend(jsValue.property("props")); rootNode->blend(jsValue.property("props"));
} else {
DoricViewNode *viewNode = getContext()->targetViewNode(viewId);
if (viewNode != nullptr) {
viewNode->blend(jsValue.property("props"));
}
} }
}, },
DoricThreadMode::UI); DoricThreadMode::UI);

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

@ -35,9 +35,15 @@ void DoricViewNode::blend(QJSValue jsValue) {
void DoricViewNode::blend(QQuickItem *view, QString name, QJSValue prop) { void DoricViewNode::blend(QQuickItem *view, QString name, QJSValue prop) {
if (name == "width") { if (name == "width") {
view->setWidth(100); if (!prop.isNumber()) {
return;
}
view->setWidth(prop.toInt());
} else if (name == "height") { } else if (name == "height") {
view->setHeight(100); if (!prop.isNumber()) {
return;
}
view->setHeight(prop.toInt());
} else if (name == "backgroundColor") { } else if (name == "backgroundColor") {
} }
} }