Small tweaks to property override button behavior

nyalldawson · nyalldawson · commit 3371003402df · 2017-02-14T13:48:11.000+10:00
diff --git a/src/gui/qgspropertyassistantwidget.cpp b/src/gui/qgspropertyassistantwidget.cpp
@@ -82,7 +82,7 @@ void QgsPropertyAssistantWidget::registerExpressionContextGenerator( QgsExpressi
 
 void QgsPropertyAssistantWidget::updateProperty( QgsProperty& property )
 {
-  property.setActive( true );
+  property.setActive( !mExpressionWidget->currentText().isEmpty() );
   if ( mExpressionWidget->isExpression() )
     property.setExpressionString( mExpressionWidget->currentField() );
   else
diff --git a/src/gui/qgspropertyoverridebutton.cpp b/src/gui/qgspropertyoverridebutton.cpp
@@ -449,18 +449,14 @@ void QgsPropertyOverrideButton::menuActionTriggered( QAction* action )
       mExpressionString = exprString;
       mProperty.setExpressionString( mExpressionString );
       mProperty.setTransformer( nullptr );
-      setActivePrivate( mProperty.isActive() );
+      setActivePrivate( true );
       updateGui();
       emit changed();
     }
   }
   else if ( action == mActionClearExpr )
   {
-    // only deactivate if defined expression is being used
-    if ( mProperty.isActive() && mProperty.propertyType() == QgsProperty::ExpressionBasedProperty )
-    {
-      setActivePrivate( false );
-    }
+    setActivePrivate( false );
     mProperty.setStaticValue( QVariant() );
     mProperty.setTransformer( nullptr );
     mExpressionString.clear();
@@ -528,6 +524,13 @@ void QgsPropertyOverrideButton::showExpressionDialog()
 
 void QgsPropertyOverrideButton::showAssistant()
 {
+  //first step - try to convert any existing expression to a transformer if one doesn't
+  //already exist
+  if ( !mProperty.transformer() )
+  {
+    ( void )mProperty.convertToTransformer();
+  }
+
   QgsPanelWidget* panel = QgsPanelWidget::findParentPanel( this );
   if ( panel && panel->dockMode() )
   {
diff --git a/src/gui/symbology-ng/qgssizescalewidget.h b/src/gui/symbology-ng/qgssizescalewidget.h
@@ -22,6 +22,7 @@
 #include <QStandardItemModel>
 #include <QItemDelegate>
 #include "qgis_gui.h"
+#include "qgsproperty.h"
 
 class QgsVectorLayer;
 class QgsSymbol;

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void QgsPropertyAssistantWidget::registerExpressionContextGenerator( QgsExpressi`
`82`	`82`
`83`	`83`	`void QgsPropertyAssistantWidget::updateProperty( QgsProperty& property )`
`84`	`84`	`{`
`85`		`- property.setActive( true );`
	`85`	`+ property.setActive( !mExpressionWidget->currentText().isEmpty() );`
`86`	`86`	`if ( mExpressionWidget->isExpression() )`
`87`	`87`	`property.setExpressionString( mExpressionWidget->currentField() );`
`88`	`88`	`else`