forked from qt-creator/qt-creator
QmlDesigner: Effect maker UI tweaks
- Corrected property name font size - Disabled zoom controls when not needed - Updated Zoom Fit icon - Show vec2, 3, and 4 properties in 1 line Change-Id: I6d5474163b708790b61b6d3462068b138431bd49 Reviewed-by: Amr Elsayed <amr.elsayed@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
@@ -20,6 +20,10 @@ Uniform::Uniform(const QJsonObject &propObj)
|
||||
m_type = Uniform::typeFromString(propObj.value("type").toString());
|
||||
defaultValue = propObj.value("defaultValue").toString();
|
||||
|
||||
m_displayName = propObj.value("displayName").toString();
|
||||
if (m_displayName.isEmpty())
|
||||
m_displayName = m_name;
|
||||
|
||||
if (m_type == Type::Sampler) {
|
||||
if (!defaultValue.isEmpty())
|
||||
defaultValue = getResourcePath(defaultValue);
|
||||
|
||||
@@ -18,7 +18,7 @@ class Uniform : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
Q_PROPERTY(QString uniformName MEMBER m_name CONSTANT)
|
||||
Q_PROPERTY(QString uniformName MEMBER m_displayName CONSTANT)
|
||||
Q_PROPERTY(QString uniformType READ typeName CONSTANT)
|
||||
Q_PROPERTY(QVariant uniformValue READ value WRITE setValue NOTIFY uniformValueChanged)
|
||||
Q_PROPERTY(QVariant uniformBackendValue READ backendValue NOTIFY uniformBackendValueChanged)
|
||||
@@ -89,6 +89,7 @@ private:
|
||||
QVariant m_minValue;
|
||||
QVariant m_maxValue;
|
||||
QString m_name;
|
||||
QString m_displayName;
|
||||
QString m_description;
|
||||
QString m_customValue;
|
||||
bool m_useCustomValue = false;
|
||||
|
||||
Reference in New Issue
Block a user