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

abstract spec mode

Browse Source
This commit is contained in:
王劲鹏
2021-04-06 11:19:48 +08:00
committed by osborn
parent 7e59150831
commit 3a251b5adf
4 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doric-Qt/doric/shader/DoricSuperNode.cpp
View File

@@ -57,7 +57,7 @@ void DoricSuperNode::blendSubLayoutConfig(DoricViewNode *viewNode,
QJsonValue DoricSuperNode::generateDefaultLayoutConfig() {
QJsonObject layoutConfig;
layoutConfig.insert("widthSpec", 0);
layoutConfig.insert("heightSpec", 0);
layoutConfig.insert("widthSpec", SpecMode::JUST);
layoutConfig.insert("heightSpec", SpecMode::JUST);
return layoutConfig;
}

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

@@ -12,28 +12,28 @@ void DoricViewNode::blendLayoutConfig(QJsonValue jsObject) {
if (widthSpec.isDouble()) {
switch (widthSpec.toInt()) {
case 0:
mView->setProperty("widthSpec", 0);
case SpecMode::JUST:
mView->setProperty("widthSpec", SpecMode::JUST);
break;
case 1:
mView->setProperty("widthSpec", 1);
case SpecMode::FIT:
mView->setProperty("widthSpec", SpecMode::FIT);
break;
case 2:
mView->setProperty("widthSpec", 2);
case SpecMode::MOST:
mView->setProperty("widthSpec", SpecMode::MOST);
break;
}
}
if (heightSpec.isDouble()) {
switch (heightSpec.toInt()) {
case 0:
mView->setProperty("heightSpec", 0);
case SpecMode::JUST:
mView->setProperty("heightSpec", SpecMode::JUST);
break;
case 1:
mView->setProperty("heightSpec", 1);
case SpecMode::FIT:
mView->setProperty("heightSpec", SpecMode::FIT);
break;
case 2:
mView->setProperty("heightSpec", 2);
case SpecMode::MOST:
mView->setProperty("heightSpec", SpecMode::MOST);
break;
}
}
@@ -87,7 +87,7 @@ void DoricViewNode::blend(QQuickItem *view, QString name, QJsonValue prop) {
} else {
QJsonValue widthSpec = this->mLayoutConfig["widthSpec"];
if (widthSpec.isDouble()) {
if (widthSpec.toInt() == 0) {
if (widthSpec.toInt() == SpecMode::JUST) {
view->setWidth(prop.toInt());
}
}
@@ -101,7 +101,7 @@ void DoricViewNode::blend(QQuickItem *view, QString name, QJsonValue prop) {
} else {
QJsonValue heightSpec = this->mLayoutConfig["heightSpec"];
if (heightSpec.isDouble()) {
if (heightSpec.toInt() == 0) {
if (heightSpec.toInt() == SpecMode::JUST) {
view->setHeight(prop.toInt());
}
}

11
doric-Qt/doric/shader/DoricViewNode.h
View File

@@ -1,12 +1,19 @@
#ifndef DORICVIEWNODE_H
#define DORICVIEWNODE_H
#include <QQuickItem>
#include <QJsonValue>
#include <QJsonObject>
#include <QJsonValue>
#include <QQuickItem>
#include "../utils/DoricContextHolder.h"
class SpecMode {
public:
const static int JUST = 0;
const static int FIT = 1;
const static int MOST = 2;
};
class DoricSuperNode;
class DoricViewNode : public DoricContextHolder {