forked from qt-creator/qt-creator
EffectMaker: Remove anchor backend warning from color editor
Change-Id: I2709e42337f026f69b0535fc40a2a91cda745ebd Reviewed-by: Amr Elsayed <amr.elsayed@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
@@ -134,6 +134,7 @@ void EffectMakerWidget::initView()
|
|||||||
m_quickWidget->rootContext()->setContextObject(ctxObj);
|
m_quickWidget->rootContext()->setContextObject(ctxObj);
|
||||||
|
|
||||||
m_backendModelNode.setup(m_effectMakerView->rootModelNode());
|
m_backendModelNode.setup(m_effectMakerView->rootModelNode());
|
||||||
|
m_quickWidget->rootContext()->setContextProperty("anchorBackend", &m_backendAnchorBinding);
|
||||||
m_quickWidget->rootContext()->setContextProperty("modelNodeBackend", &m_backendModelNode);
|
m_quickWidget->rootContext()->setContextProperty("modelNodeBackend", &m_backendModelNode);
|
||||||
|
|
||||||
// init the first load of the QML UI elements
|
// init the first load of the QML UI elements
|
||||||
|
@@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h"
|
||||||
#include "qmldesigner/components/propertyeditor/qmlmodelnodeproxy.h"
|
#include "qmldesigner/components/propertyeditor/qmlmodelnodeproxy.h"
|
||||||
|
|
||||||
#include <coreplugin/icontext.h>
|
#include <coreplugin/icontext.h>
|
||||||
@@ -54,6 +55,7 @@ private:
|
|||||||
QPointer<EffectMakerView> m_effectMakerView;
|
QPointer<EffectMakerView> m_effectMakerView;
|
||||||
QPointer<StudioQuickWidget> m_quickWidget;
|
QPointer<StudioQuickWidget> m_quickWidget;
|
||||||
QmlDesigner::QmlModelNodeProxy m_backendModelNode;
|
QmlDesigner::QmlModelNodeProxy m_backendModelNode;
|
||||||
|
QmlDesigner::QmlAnchorBindingProxy m_backendAnchorBinding;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace EffectMaker
|
} // namespace EffectMaker
|
||||||
|
@@ -206,7 +206,7 @@ void MaterialEditorQmlBackend::setSource(const QUrl &url)
|
|||||||
m_view->setSource(url);
|
m_view->setSource(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
Internal::QmlAnchorBindingProxy &MaterialEditorQmlBackend::backendAnchorBinding()
|
QmlAnchorBindingProxy &MaterialEditorQmlBackend::backendAnchorBinding()
|
||||||
{
|
{
|
||||||
return m_backendAnchorBinding;
|
return m_backendAnchorBinding;
|
||||||
}
|
}
|
||||||
|
@@ -38,7 +38,7 @@ public:
|
|||||||
MaterialEditorContextObject *contextObject() const;
|
MaterialEditorContextObject *contextObject() const;
|
||||||
QQuickWidget *widget() const;
|
QQuickWidget *widget() const;
|
||||||
void setSource(const QUrl &url);
|
void setSource(const QUrl &url);
|
||||||
Internal::QmlAnchorBindingProxy &backendAnchorBinding();
|
QmlAnchorBindingProxy &backendAnchorBinding();
|
||||||
void updateMaterialPreview(const QPixmap &pixmap);
|
void updateMaterialPreview(const QPixmap &pixmap);
|
||||||
DesignerPropertyMap &backendValuesPropertyMap();
|
DesignerPropertyMap &backendValuesPropertyMap();
|
||||||
MaterialEditorTransaction *materialEditorTransaction() const;
|
MaterialEditorTransaction *materialEditorTransaction() const;
|
||||||
@@ -59,7 +59,7 @@ private:
|
|||||||
PropertyName auxNamePostFix(const PropertyName &propertyName);
|
PropertyName auxNamePostFix(const PropertyName &propertyName);
|
||||||
|
|
||||||
QQuickWidget *m_view = nullptr;
|
QQuickWidget *m_view = nullptr;
|
||||||
Internal::QmlAnchorBindingProxy m_backendAnchorBinding;
|
QmlAnchorBindingProxy m_backendAnchorBinding;
|
||||||
QmlModelNodeProxy m_backendModelNode;
|
QmlModelNodeProxy m_backendModelNode;
|
||||||
DesignerPropertyMap m_backendValuesPropertyMap;
|
DesignerPropertyMap m_backendValuesPropertyMap;
|
||||||
QScopedPointer<MaterialEditorTransaction> m_materialEditorTransaction;
|
QScopedPointer<MaterialEditorTransaction> m_materialEditorTransaction;
|
||||||
|
@@ -573,7 +573,7 @@ void GradientModel::setAnchorBackend(const QVariant &anchorBackend)
|
|||||||
auto anchorBackendObject = anchorBackend.value<QObject*>();
|
auto anchorBackendObject = anchorBackend.value<QObject*>();
|
||||||
|
|
||||||
const auto backendCasted =
|
const auto backendCasted =
|
||||||
qobject_cast<const QmlDesigner::Internal::QmlAnchorBindingProxy *>(anchorBackendObject);
|
qobject_cast<const QmlDesigner::QmlAnchorBindingProxy *>(anchorBackendObject);
|
||||||
|
|
||||||
if (backendCasted)
|
if (backendCasted)
|
||||||
m_itemNode = backendCasted->getItemNode();
|
m_itemNode = backendCasted->getItemNode();
|
||||||
|
@@ -400,7 +400,7 @@ void PropertyEditorQmlBackend::setSource(const QUrl &url)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Internal::QmlAnchorBindingProxy &PropertyEditorQmlBackend::backendAnchorBinding()
|
QmlAnchorBindingProxy &PropertyEditorQmlBackend::backendAnchorBinding()
|
||||||
{
|
{
|
||||||
return m_backendAnchorBinding;
|
return m_backendAnchorBinding;
|
||||||
}
|
}
|
||||||
|
@@ -41,7 +41,7 @@ public:
|
|||||||
PropertyEditorContextObject* contextObject();
|
PropertyEditorContextObject* contextObject();
|
||||||
QQuickWidget *widget();
|
QQuickWidget *widget();
|
||||||
void setSource(const QUrl& url);
|
void setSource(const QUrl& url);
|
||||||
Internal::QmlAnchorBindingProxy &backendAnchorBinding();
|
QmlAnchorBindingProxy &backendAnchorBinding();
|
||||||
DesignerPropertyMap &backendValuesPropertyMap();
|
DesignerPropertyMap &backendValuesPropertyMap();
|
||||||
PropertyEditorTransaction *propertyEditorTransaction();
|
PropertyEditorTransaction *propertyEditorTransaction();
|
||||||
|
|
||||||
@@ -88,7 +88,7 @@ private:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
Quick2PropertyEditorView *m_view;
|
Quick2PropertyEditorView *m_view;
|
||||||
Internal::QmlAnchorBindingProxy m_backendAnchorBinding;
|
QmlAnchorBindingProxy m_backendAnchorBinding;
|
||||||
QmlModelNodeProxy m_backendModelNode;
|
QmlModelNodeProxy m_backendModelNode;
|
||||||
DesignerPropertyMap m_backendValuesPropertyMap;
|
DesignerPropertyMap m_backendValuesPropertyMap;
|
||||||
QScopedPointer<PropertyEditorTransaction> m_propertyEditorTransaction;
|
QScopedPointer<PropertyEditorTransaction> m_propertyEditorTransaction;
|
||||||
|
@@ -52,8 +52,6 @@ static inline void restoreProperty(const ModelNode &node, const PropertyName &pr
|
|||||||
node.variantProperty(propertyName).setValue(*value);
|
node.variantProperty(propertyName).setValue(*value);
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Internal {
|
|
||||||
|
|
||||||
QmlAnchorBindingProxy::QmlAnchorBindingProxy(QObject *parent) :
|
QmlAnchorBindingProxy::QmlAnchorBindingProxy(QObject *parent) :
|
||||||
QObject(parent),
|
QObject(parent),
|
||||||
m_relativeTopTarget(SameEdge), m_relativeBottomTarget(SameEdge),
|
m_relativeTopTarget(SameEdge), m_relativeBottomTarget(SameEdge),
|
||||||
@@ -1132,6 +1130,4 @@ void QmlAnchorBindingProxy::setDefaultAnchorTarget(const ModelNode &modelNode)
|
|||||||
m_rightTarget = modelNode;
|
m_rightTarget = modelNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Internal
|
|
||||||
} // namespace QmlDesigner
|
} // namespace QmlDesigner
|
||||||
|
|
||||||
|
@@ -13,9 +13,7 @@ namespace QmlDesigner {
|
|||||||
|
|
||||||
class NodeInstanceView;
|
class NodeInstanceView;
|
||||||
|
|
||||||
namespace Internal {
|
class QMLDESIGNERCORE_EXPORT QmlAnchorBindingProxy : public QObject
|
||||||
|
|
||||||
class QmlAnchorBindingProxy : public QObject
|
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
@@ -222,5 +220,4 @@ private:
|
|||||||
bool m_ignoreQml;
|
bool m_ignoreQml;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Internal
|
|
||||||
} // namespace QmlDesigner
|
} // namespace QmlDesigner
|
||||||
|
@@ -53,7 +53,7 @@ void Quick2PropertyEditorView::registerQmlTypes()
|
|||||||
ItemFilterModel::registerDeclarativeType();
|
ItemFilterModel::registerDeclarativeType();
|
||||||
ListValidator::registerDeclarativeType();
|
ListValidator::registerDeclarativeType();
|
||||||
ColorPaletteBackend::registerDeclarativeType();
|
ColorPaletteBackend::registerDeclarativeType();
|
||||||
Internal::QmlAnchorBindingProxy::registerDeclarativeType();
|
QmlAnchorBindingProxy::registerDeclarativeType();
|
||||||
BindingEditor::registerDeclarativeType();
|
BindingEditor::registerDeclarativeType();
|
||||||
ActionEditor::registerDeclarativeType();
|
ActionEditor::registerDeclarativeType();
|
||||||
AnnotationEditor::registerDeclarativeType();
|
AnnotationEditor::registerDeclarativeType();
|
||||||
|
@@ -172,7 +172,7 @@ void TextureEditorQmlBackend::setSource(const QUrl &url)
|
|||||||
m_view->setSource(url);
|
m_view->setSource(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
Internal::QmlAnchorBindingProxy &TextureEditorQmlBackend::backendAnchorBinding()
|
QmlAnchorBindingProxy &TextureEditorQmlBackend::backendAnchorBinding()
|
||||||
{
|
{
|
||||||
return m_backendAnchorBinding;
|
return m_backendAnchorBinding;
|
||||||
}
|
}
|
||||||
|
@@ -39,7 +39,7 @@ public:
|
|||||||
TextureEditorContextObject *contextObject() const;
|
TextureEditorContextObject *contextObject() const;
|
||||||
QQuickWidget *widget() const;
|
QQuickWidget *widget() const;
|
||||||
void setSource(const QUrl &url);
|
void setSource(const QUrl &url);
|
||||||
Internal::QmlAnchorBindingProxy &backendAnchorBinding();
|
QmlAnchorBindingProxy &backendAnchorBinding();
|
||||||
DesignerPropertyMap &backendValuesPropertyMap();
|
DesignerPropertyMap &backendValuesPropertyMap();
|
||||||
TextureEditorTransaction *textureEditorTransaction() const;
|
TextureEditorTransaction *textureEditorTransaction() const;
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ private:
|
|||||||
PropertyName auxNamePostFix(const PropertyName &propertyName);
|
PropertyName auxNamePostFix(const PropertyName &propertyName);
|
||||||
|
|
||||||
QQuickWidget *m_view = nullptr;
|
QQuickWidget *m_view = nullptr;
|
||||||
Internal::QmlAnchorBindingProxy m_backendAnchorBinding;
|
QmlAnchorBindingProxy m_backendAnchorBinding;
|
||||||
QmlModelNodeProxy m_backendModelNode;
|
QmlModelNodeProxy m_backendModelNode;
|
||||||
DesignerPropertyMap m_backendValuesPropertyMap;
|
DesignerPropertyMap m_backendValuesPropertyMap;
|
||||||
QScopedPointer<TextureEditorTransaction> m_textureEditorTransaction;
|
QScopedPointer<TextureEditorTransaction> m_textureEditorTransaction;
|
||||||
|
Reference in New Issue
Block a user