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

add click for text stack hlayout vlayout

Browse Source
This commit is contained in:
王劲鹏 2021-03-19 16:13:02 +08:00 committed by osborn
parent 0784fa844c
commit ace6d87bda
13 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,8 @@ import "util.mjs" as Util
import "gravity.mjs" as Gravity
Rectangle {
property int wrapper: 0
property var tag: "HLayout"
property var uuid: Util.uuidv4()
@ -29,7 +31,7 @@ Rectangle {
if (this.widthSpec === 2) {
this.width = parent.width
// children[0].width = parent.width
// children[1].width = parent.width
}
}
@ -39,7 +41,7 @@ Rectangle {
if (this.heightSpec === 2) {
this.height = parent.height
children[0].height = parent.height
children[1].height = parent.height
}
}
@ -60,6 +62,13 @@ Rectangle {
color: 'transparent'
MouseArea {
anchors.fill: parent
onClicked: {
mouseAreaBridge.onClick(wrapper)
}
}
RowLayout {
property int gravity: 0

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

@ -5,7 +5,10 @@ import QtQuick.Layouts 1.15
import "util.mjs" as Util
Rectangle {
property int wrapper: 0
property var uuid: Util.uuidv4()
property int widthSpec: 0
property int heightSpec: 0
property int childrenRectWidth: childrenRect.width
@ -54,4 +57,11 @@ Rectangle {
}
color: 'transparent'
MouseArea {
anchors.fill: parent
onClicked: {
mouseAreaBridge.onClick(wrapper)
}
}
}

4
doric-Qt/doric/resources/text.qml
View File

@ -5,6 +5,8 @@ import "util.mjs" as Util
import "gravity.mjs" as Gravity
Rectangle {
property int wrapper: 0
property var uuid: Util.uuidv4()
property int childrenRectWidth: childrenRect.width
property int childrenRectHeight: childrenRect.width
@ -52,7 +54,7 @@ Rectangle {
MouseArea {
anchors.fill: parent
onClicked: {
mouseAreaBridge.onClick("index")
mouseAreaBridge.onClick(wrapper)
}
}
}

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

@ -6,6 +6,8 @@ import "util.mjs" as Util
import "gravity.mjs" as Gravity
Rectangle {
property int wrapper: 0
property var tag: "VLayout"
property var uuid: Util.uuidv4()
@ -29,7 +31,7 @@ Rectangle {
if (this.widthSpec === 2) {
this.width = parent.width
children[0].width = parent.width
children[1].width = parent.width
}
}
@ -39,7 +41,7 @@ Rectangle {
if (this.heightSpec === 2) {
this.height = parent.height
// children[0].height = parent.height
// children[1].height = parent.height
}
}
@ -60,6 +62,13 @@ Rectangle {
color: 'transparent'
MouseArea {
anchors.fill: parent
onClicked: {
mouseAreaBridge.onClick(wrapper)
}
}
ColumnLayout {
property int gravity: 0

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

@ -27,7 +27,7 @@ void DoricGroupNode::configChildNode() {
if (mType.isEmpty() || mType == "Stack") {
parent = mView;
} else {
parent = mView->childItems().at(0);
parent = mView->childItems().at(1);
}
for (int idx = 0; idx < mChildViewIds.size(); idx++) {
QString id = mChildViewIds.at(idx);

5
doric-Qt/doric/shader/DoricHLayoutNode.cpp
View File

@ -11,14 +11,15 @@ QQuickItem *DoricHLayoutNode::build() {
}
QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
item->setProperty("wrapper", (qint64)this);
return item;
}
void DoricHLayoutNode::blend(QQuickItem *view, QString name, QJSValue prop) {
if (name == "space") {
view->childItems().at(0)->setProperty("spacing", prop.toInt());
view->childItems().at(1)->setProperty("spacing", prop.toInt());
} else if (name == "gravity") {
view->childItems().at(0)->setProperty("gravity", prop.toInt());
view->childItems().at(1)->setProperty("gravity", prop.toInt());
} else {
DoricGroupNode::blend(view, name, prop);
}

1
doric-Qt/doric/shader/DoricStackNode.cpp
View File

@ -11,6 +11,7 @@ QQuickItem *DoricStackNode::build() {
}
QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
item->setProperty("wrapper", (qint64)this);
return item;
}

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

@ -12,6 +12,7 @@ QQuickItem *DoricTextNode::build() {
}
QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
item->setProperty("wrapper", (qint64)this);
return item;
}

5
doric-Qt/doric/shader/DoricVLayoutNode.cpp
View File

@ -11,14 +11,15 @@ QQuickItem *DoricVLayoutNode::build() {
}
QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
item->setProperty("wrapper", (qint64)this);
return item;
}
void DoricVLayoutNode::blend(QQuickItem *view, QString name, QJSValue prop) {
if (name == "space") {
view->childItems().at(0)->setProperty("spacing", prop.toInt());
view->childItems().at(1)->setProperty("spacing", prop.toInt());
} else if (name == "gravity") {
view->childItems().at(0)->setProperty("gravity", prop.toInt());
view->childItems().at(1)->setProperty("gravity", prop.toInt());
} else {
DoricGroupNode::blend(view, name, prop);
}

1
doric-Qt/doric/utils/DoricConstant.cpp
View File

@ -29,6 +29,7 @@ const QString DoricConstant::GLOBAL_DORIC = "doric";
const QString DoricConstant::DORIC_CONTEXT_INVOKE = "jsCallEntityMethod";
const QString DoricConstant::DORIC_TIMER_CALLBACK = "jsCallbackTimer";
const QString DoricConstant::DORIC_ENTITY_RESPONSE = "__response__";
const QString DoricConstant::DORIC_ENTITY_INIT = "__init__";
const QString DoricConstant::DORIC_ENTITY_CREATE = "__onCreate__";
const QString DoricConstant::DORIC_ENTITY_BUILD = "__build__";

1
doric-Qt/doric/utils/DoricConstant.h
View File

@ -26,6 +26,7 @@ public:
static const QString DORIC_CONTEXT_INVOKE;
static const QString DORIC_TIMER_CALLBACK;
static const QString DORIC_ENTITY_RESPONSE;
static const QString DORIC_ENTITY_CREATE;
static const QString DORIC_ENTITY_INIT;
static const QString DORIC_ENTITY_BUILD;

7
doric-Qt/doric/utils/DoricMouseAreaBridge.cpp
View File

@ -1,7 +1,10 @@
#include "DoricMouseAreaBridge.h"
#include "shader/DoricViewNode.h"
DoricMouseAreaBridge::DoricMouseAreaBridge(QObject *parent) : QObject(parent) {}
void DoricMouseAreaBridge::onClick(QVariant functionId) {
qCritical() << functionId;
void DoricMouseAreaBridge::onClick(qint64 pointer) {
QObject *object = (QObject *)(pointer);
DoricViewNode *viewNode = dynamic_cast<DoricViewNode *>(object);
qCritical() << viewNode;
}

2
doric-Qt/doric/utils/DoricMouseAreaBridge.h
View File

@ -10,7 +10,7 @@ public:
explicit DoricMouseAreaBridge(QObject *parent = nullptr);
Q_INVOKABLE
void onClick(QVariant functionId);
void onClick(qint64 pointer);
signals:
};