diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-02 15:12:05 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-07 08:33:33 +0000 |
| commit | 5af4c9b237a23ce12ca7c56eb6c9ecda17743228 (patch) | |
| tree | fe8f85d5c353216cddc18df3c996be0c50cf0c67 /examples/quick/shapes/content/pathiteminteract.qml | |
| parent | 961da5273e17655e73ec0975c6de446b88d7f5ca (diff) | |
Reduce objects: Make ShapePath inherit Path
Shape { ShapePath { Path { ... } } } simply becomes
Shape { ShapePath { ... } }
Change-Id: Ie57936cd7953c8a8d6c67e78b9d73bdbe2a05316
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'examples/quick/shapes/content/pathiteminteract.qml')
| -rw-r--r-- | examples/quick/shapes/content/pathiteminteract.qml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/examples/quick/shapes/content/pathiteminteract.qml b/examples/quick/shapes/content/pathiteminteract.qml index 2e968eb56d..b1c9cdf123 100644 --- a/examples/quick/shapes/content/pathiteminteract.qml +++ b/examples/quick/shapes/content/pathiteminteract.qml @@ -192,20 +192,20 @@ Rectangle { var p = Qt.createQmlObject('import QtQuick 2.9; import QtQuick.Shapes 1.0; ShapePath {' + 'strokeColor: "black"; fillColor: "transparent";'+ 'strokeWidth: ' + widthSlider.value + ';' + - 'Path { startX: ' + x + '; startY: ' + y + ';' + - 'PathLine { x: ' + x + ' + 1; y: ' + y + ' + 1 } } }', + 'startX: ' + x + '; startY: ' + y + ';' + + 'PathLine { x: ' + x + ' + 1; y: ' + y + ' + 1 } }', root, "dynamic_visual_path"); shape.elements.push(p); activePath = p; }, "move": function(x, y) { if (!activePath) return; - var pathObj = activePath.path.pathElements[0]; + var pathObj = activePath.pathElements[0]; pathObj.x = x; pathObj.y = y; }, "end": function() { - canvas.genResizer(activePath.path, activePath.path.startX, activePath.path.startY, "startX", "startY", "red"); - var pathObj = activePath.path.pathElements[0]; + canvas.genResizer(activePath, activePath.startX, activePath.startY, "startX", "startY", "red"); + var pathObj = activePath.pathElements[0]; canvas.genResizer(pathObj, pathObj.x, pathObj.y, "x", "y", "red"); activePath = null; } @@ -214,21 +214,21 @@ Rectangle { var p = Qt.createQmlObject('import QtQuick 2.9; import QtQuick.Shapes 1.0; ShapePath {' + 'strokeColor: "black"; fillColor: "' + (root.fill ? 'green' : 'transparent') + '";'+ 'strokeWidth: ' + widthSlider.value + ';' + - 'Path { startX: ' + x + '; startY: ' + y + ';' + + 'startX: ' + x + '; startY: ' + y + ';' + 'PathCubic { x: ' + x + ' + 1; y: ' + y + ' + 1;' + - 'control1X: ' + x + ' + 50; control1Y: ' + y + ' + 50; control2X: ' + x + ' + 150; control2Y: ' + y + ' + 50; } } }', + 'control1X: ' + x + ' + 50; control1Y: ' + y + ' + 50; control2X: ' + x + ' + 150; control2Y: ' + y + ' + 50; } }', root, "dynamic_visual_path"); shape.elements.push(p); activePath = p; }, "move": function(x, y) { if (!activePath) return; - var pathObj = activePath.path.pathElements[0]; + var pathObj = activePath.pathElements[0]; pathObj.x = x; pathObj.y = y; }, "end": function() { - canvas.genResizer(activePath.path, activePath.path.startX, activePath.path.startY, "startX", "startY", "red"); - var pathObj = activePath.path.pathElements[0]; + canvas.genResizer(activePath, activePath.startX, activePath.startY, "startX", "startY", "red"); + var pathObj = activePath.pathElements[0]; canvas.genResizer(pathObj, pathObj.x, pathObj.y, "x", "y", "red"); canvas.genResizer(pathObj, pathObj.control1X, pathObj.control1Y, "control1X", "control1Y", "blue"); canvas.genResizer(pathObj, pathObj.control2X, pathObj.control2Y, "control2X", "control2Y", "lightBlue"); @@ -239,21 +239,21 @@ Rectangle { var p = Qt.createQmlObject('import QtQuick 2.9; import QtQuick.Shapes 1.0; ShapePath {' + 'strokeColor: "black"; fillColor: "' + (root.fill ? 'green' : 'transparent') + '";'+ 'strokeWidth: ' + widthSlider.value + ';' + - 'Path { startX: ' + x + '; startY: ' + y + ';' + + 'startX: ' + x + '; startY: ' + y + ';' + 'PathQuad { x: ' + x + ' + 1; y: ' + y + ' + 1;' + - 'controlX: ' + x + ' + 50; controlY: ' + y + ' + 50 } } }', + 'controlX: ' + x + ' + 50; controlY: ' + y + ' + 50 } }', root, "dynamic_visual_path"); shape.elements.push(p); activePath = p; }, "move": function(x, y) { if (!activePath) return; - var pathObj = activePath.path.pathElements[0]; + var pathObj = activePath.pathElements[0]; pathObj.x = x; pathObj.y = y; }, "end": function() { - canvas.genResizer(activePath.path, activePath.path.startX, activePath.path.startY, "startX", "startY", "red"); - var pathObj = activePath.path.pathElements[0]; + canvas.genResizer(activePath, activePath.startX, activePath.startY, "startX", "startY", "red"); + var pathObj = activePath.pathElements[0]; canvas.genResizer(pathObj, pathObj.x, pathObj.y, "x", "y", "red"); canvas.genResizer(pathObj, pathObj.controlX, pathObj.controlY, "controlX", "controlY", "blue"); activePath = null; |