diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2021-11-04 17:46:48 +0100 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2021-11-08 11:10:38 +0000 |
| commit | 39d2fc91fdcbca87d9adf915906433fc6ce79eec (patch) | |
| tree | 8a7c802a380e775ccc39ce0b2f7ae7fe708e5011 | |
| parent | 5c0c3ff6cad1c2cb2227f07b9c5b7ecf6c27dbf5 (diff) | |
QmlDesigner: Do not allow resizing scaled items
The resize tool does not work as expected in this case.
Task-number: QDS-5346
Change-Id: Id977bb29670d216cf0989e4b2cd5072ae40ad6d1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp b/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp index 4a2426f29f..ad5f2fefff 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp @@ -63,7 +63,7 @@ static bool itemIsResizable(const QmlItemNode &qmlItemNode) && qmlItemNode.instanceIsResizable() && qmlItemNode.modelIsMovable() && qmlItemNode.modelIsResizable() - && !qmlItemNode.instanceHasRotationTransform() + && !qmlItemNode.instanceHasScaleOrRotationTransform() && !qmlItemNode.instanceIsInLayoutable(); } diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h index 9be07edfbf..3a3498e6c9 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h @@ -99,7 +99,7 @@ public: bool instanceIsMovable() const; bool instanceIsResizable() const; bool instanceIsInLayoutable() const; - bool instanceHasRotationTransform() const; + bool instanceHasScaleOrRotationTransform() const; bool modelIsMovable() const; bool modelIsResizable() const; diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index c65f281f64..bc5089f530 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -303,9 +303,9 @@ bool QmlItemNode::instanceIsInLayoutable() const return nodeInstance().isInLayoutable(); } -bool QmlItemNode::instanceHasRotationTransform() const +bool QmlItemNode::instanceHasScaleOrRotationTransform() const { - return nodeInstance().transform().type() > QTransform::TxScale; + return nodeInstance().transform().type() > QTransform::TxTranslate; } bool itemIsMovable(const ModelNode &modelNode) |