diff --git a/doric-Qt/doric/doric.pro.user b/doric-Qt/doric/doric.pro.user index 58a534bc..ec9f62ef 100644 --- a/doric-Qt/doric/doric.pro.user +++ b/doric-Qt/doric/doric.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -88,16 +88,16 @@ ProjectExplorer.Project.Target.0 Desktop - Desktop Qt 6.0.2 MSVC2019 64bit - Desktop Qt 6.0.2 MSVC2019 64bit - qt.qt6.602.win64_msvc2019_64_kit + Desktop Qt 6.0.3 MSVC2019 64bit + Desktop Qt 6.0.3 MSVC2019 64bit + qt.qt6.603.win64_msvc2019_64_kit 0 0 0 0 - C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_2_MSVC2019_64bit-Debug - C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_2_MSVC2019_64bit-Debug + C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_3_MSVC2019_64bit-Debug + C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_3_MSVC2019_64bit-Debug true @@ -136,8 +136,8 @@ 0 - C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_2_MSVC2019_64bit-Release - C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_2_MSVC2019_64bit-Release + C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_3_MSVC2019_64bit-Release + C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_3_MSVC2019_64bit-Release true @@ -178,8 +178,8 @@ 0 - C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_2_MSVC2019_64bit-Profile - C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_2_MSVC2019_64bit-Profile + C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_3_MSVC2019_64bit-Profile + C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_3_MSVC2019_64bit-Profile true @@ -301,7 +301,7 @@ true false true - C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_2_MSVC2019_64bit-Debug + C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_3_MSVC2019_64bit-Debug 1 @@ -310,16 +310,16 @@ ProjectExplorer.Project.Target.1 Desktop - Desktop Qt 6.0.1 MinGW 64-bit - Desktop Qt 6.0.1 MinGW 64-bit - qt.qt6.601.win64_mingw81_kit + Desktop Qt 6.0.3 MinGW 64-bit + Desktop Qt 6.0.3 MinGW 64-bit + qt.qt6.603.win64_mingw81_kit 0 0 0 0 - C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_1_MinGW_64_bit-Debug - C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_1_MinGW_64_bit-Debug + C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_3_MinGW_64_bit-Debug + C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_3_MinGW_64_bit-Debug true @@ -358,8 +358,8 @@ 0 - C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_1_MinGW_64_bit-Release - C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_1_MinGW_64_bit-Release + C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_3_MinGW_64_bit-Release + C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_3_MinGW_64_bit-Release true @@ -400,8 +400,8 @@ 0 - C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_1_MinGW_64_bit-Profile - C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_1_MinGW_64_bit-Profile + C:\Users\maverick\Workspace\Doric\doric-Qt\build-doric-Desktop_Qt_6_0_3_MinGW_64_bit-Profile + C:/Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_3_MinGW_64_bit-Profile true @@ -516,11 +516,10 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/maverick/Workspace/Doric/doric-Qt/doric/doric.pro - C:/Users/maverick/Workspace/Doric/doric-Qt/doric/doric.pro + ProjectExplorer.CustomExecutableRunConfiguration + false true - true false true diff --git a/doric-Qt/doric/shader/DoricSuperNode.cpp b/doric-Qt/doric/shader/DoricSuperNode.cpp index f23192da..87fb3190 100644 --- a/doric-Qt/doric/shader/DoricSuperNode.cpp +++ b/doric-Qt/doric/shader/DoricSuperNode.cpp @@ -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; } diff --git a/doric-Qt/doric/shader/DoricViewNode.cpp b/doric-Qt/doric/shader/DoricViewNode.cpp index 5527d3b8..4d965a17 100644 --- a/doric-Qt/doric/shader/DoricViewNode.cpp +++ b/doric-Qt/doric/shader/DoricViewNode.cpp @@ -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()); } } diff --git a/doric-Qt/doric/shader/DoricViewNode.h b/doric-Qt/doric/shader/DoricViewNode.h index f2c2fae8..5ebcc17e 100644 --- a/doric-Qt/doric/shader/DoricViewNode.h +++ b/doric-Qt/doric/shader/DoricViewNode.h @@ -1,12 +1,19 @@ #ifndef DORICVIEWNODE_H #define DORICVIEWNODE_H -#include -#include #include +#include +#include #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 {