aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <[email protected]>2023-12-01 15:20:34 +0200
committerTim Jenssen <[email protected]>2023-12-06 10:49:24 +0000
commit534d6d73de64a6208631962c0e0c408415513c3e (patch)
tree90d6ae0d47e5ccd9dfa315e81f4664dee9ebd3f0
parent843dc373deab3cb1edd3189b62723a5bb88a4d84 (diff)
EffectMaker: Hide properties that use custom value
These properties would require custom editor, so hide them for now. Typically there is no need to change these values from defaults. Fixes: QDS-11419 Change-Id: Ia91d48f5df86885420dccef47ed024af4cc8f430 Reviewed-by: Tim Jenssen <[email protected]>
-rw-r--r--share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNodeUniform.qml2
-rw-r--r--src/plugins/effectmakernew/effectmakeruniformsmodel.cpp1
-rw-r--r--src/plugins/effectmakernew/effectmakeruniformsmodel.h1
-rw-r--r--src/plugins/effectmakernew/uniform.h1
4 files changed, 5 insertions, 0 deletions
diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNodeUniform.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNodeUniform.qml
index 6aedc798f59..d696fccc1eb 100644
--- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNodeUniform.qml
+++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNodeUniform.qml
@@ -15,6 +15,8 @@ Item {
height: layout.implicitHeight
+ visible: !uniformUseCustomValue
+
Component.onCompleted: {
if (uniformType === "int")
valueLoader.source = "ValueInt.qml"
diff --git a/src/plugins/effectmakernew/effectmakeruniformsmodel.cpp b/src/plugins/effectmakernew/effectmakeruniformsmodel.cpp
index cfbbf3f5778..c4f9796f835 100644
--- a/src/plugins/effectmakernew/effectmakeruniformsmodel.cpp
+++ b/src/plugins/effectmakernew/effectmakeruniformsmodel.cpp
@@ -26,6 +26,7 @@ QHash<int, QByteArray> EffectMakerUniformsModel::roleNames() const
roles[MinValueRole] = "uniformMinValue";
roles[MaxValueRole] = "uniformMaxValue";
roles[TypeRole] = "uniformType";
+ roles[UseCustomValueRole] = "uniformUseCustomValue";
return roles;
}
diff --git a/src/plugins/effectmakernew/effectmakeruniformsmodel.h b/src/plugins/effectmakernew/effectmakeruniformsmodel.h
index 9b9651a8720..8b83a63dfe3 100644
--- a/src/plugins/effectmakernew/effectmakeruniformsmodel.h
+++ b/src/plugins/effectmakernew/effectmakeruniformsmodel.h
@@ -37,6 +37,7 @@ private:
MaxValueRole,
MinValueRole,
TypeRole,
+ UseCustomValueRole
};
QList<Uniform *> m_uniforms;
diff --git a/src/plugins/effectmakernew/uniform.h b/src/plugins/effectmakernew/uniform.h
index 943942639c9..7216c6d9d6b 100644
--- a/src/plugins/effectmakernew/uniform.h
+++ b/src/plugins/effectmakernew/uniform.h
@@ -26,6 +26,7 @@ class Uniform : public QObject
Q_PROPERTY(QVariant uniformMinValue MEMBER m_minValue CONSTANT)
Q_PROPERTY(QVariant uniformMaxValue MEMBER m_maxValue CONSTANT)
Q_PROPERTY(QVariant uniformDefaultValue MEMBER m_defaultValue CONSTANT)
+ Q_PROPERTY(QVariant uniformUseCustomValue MEMBER m_useCustomValue CONSTANT)
public:
enum class Type