diff --git a/doric-Qt/doric/doric.pro b/doric-Qt/doric/doric.pro index 7e0cd4fb..a1c86e8b 100644 --- a/doric-Qt/doric/doric.pro +++ b/doric-Qt/doric/doric.pro @@ -33,7 +33,6 @@ SOURCES += \ plugin/DoricShaderPlugin.cpp \ shader/DoricGroupNode.cpp \ shader/DoricHLayoutNode.cpp \ - shader/DoricLayout.cpp \ shader/DoricRootNode.cpp \ shader/DoricStackNode.cpp \ shader/DoricSuperNode.cpp \ @@ -92,7 +91,6 @@ HEADERS += \ plugin/DoricShaderPlugin.h \ shader/DoricGroupNode.h \ shader/DoricHLayoutNode.h \ - shader/DoricLayout.h \ shader/DoricRootNode.h \ shader/DoricStackNode.h \ shader/DoricSuperNode.h \ diff --git a/doric-Qt/doric/shader/DoricLayout.cpp b/doric-Qt/doric/shader/DoricLayout.cpp deleted file mode 100644 index 6a8b2128..00000000 --- a/doric-Qt/doric/shader/DoricLayout.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "DoricLayout.h" - -void DoricLayout::apply(int frameSizeWidth, int frameSizeHeight) { - this->resolved = false; - this->measure(frameSizeWidth, frameSizeHeight); -} - -void DoricLayout::apply() {} - -void DoricLayout::measure(int targetSizeWidth, int targetSizeHeight) {} diff --git a/doric-Qt/doric/shader/DoricLayout.h b/doric-Qt/doric/shader/DoricLayout.h deleted file mode 100644 index 9c84affc..00000000 --- a/doric-Qt/doric/shader/DoricLayout.h +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef DORICLAYOUT_H -#define DORICLAYOUT_H - -#include - -enum DoricLayoutType { - DoricUndefined = 0, - DoricStack = 1, - DoricVLayout = 2, - DoricHLayout = 3, -}; - -enum DoricLayoutSpec { - DoricLayoutJust = 0, - DoricLayoutFit = 1, - DoricLayoutMost = 2, -}; - -enum DoricGravity { - DoricGravitySpecified = 1, - DoricGravityStart = 1 << 1, - DoricGravityEnd = 1 << 2, - DoricGravityShiftX = 0, - DoricGravityShiftY = 4, - DoricGravityLeft = (DoricGravityStart | DoricGravitySpecified) - << DoricGravityShiftX, - DoricGravityRight = (DoricGravityEnd | DoricGravitySpecified) - << DoricGravityShiftX, - DoricGravityTop = (DoricGravityStart | DoricGravitySpecified) - << DoricGravityShiftY, - DoricGravityBottom = (DoricGravityEnd | DoricGravitySpecified) - << DoricGravityShiftY, - DoricGravityCenterX = DoricGravitySpecified << DoricGravityShiftX, - DoricGravityCenterY = DoricGravitySpecified << DoricGravityShiftY, - DoricGravityCenter = DoricGravityCenterX | DoricGravityCenterY, -}; - -class DoricLayout : public QObject { - Q_OBJECT -public: - DoricLayoutSpec widthSpec; - DoricLayoutSpec heightSpec; - DoricGravity alignment; - DoricGravity gravity; - int width; - int height; - int marginLeft; - int marginTop; - int marginRight; - int marginBottom; - int paddingLeft; - int paddingTop; - int paddingRight; - int paddingBottom; - - int weight; - - QQuickItem *view; - - DoricLayoutType layoutType; - bool disabled; - int maxWidth; - int maxHeight; - int minWidth; - int minHeight; - - bool resolved; - int measuredWidth; - int measuredHeight; - int measuredX; - int measuredY; - - bool undefined; - - DoricLayout(QObject *parent = nullptr) : QObject(parent) { - widthSpec = DoricLayoutJust; - heightSpec = DoricLayoutJust; - maxWidth = INT_MAX; - maxHeight = INT_MAX; - minWidth = INT_MIN; - minHeight = INT_MIN; - } - - void measure(int targetSizeWidth, int targetSizeHeight); - - void apply(); - - void apply(int frameSizeWidth, int frameSizeHeight); - - int contentWidth; - int contentHeight; -}; - -#endif // DORICLAYOUT_H