[layouts] Final fixes for data defined widgets showing outdated

nyalldawson · nyalldawson · commit bbdbfa17a966 · 2018-10-26T16:58:08.000+10:00
data defined definitions when clicking between layout items of the same type Fixes #18694
diff --git a/python/gui/auto_generated/layout/qgslayoutitemwidget.sip.in b/python/gui/auto_generated/layout/qgslayoutitemwidget.sip.in
@@ -55,6 +55,7 @@ Returns the current layout context coverage layer (if set).
 Returns the atlas for the layout, if available
 %End
 
+
 };
 
 class QgsLayoutItemBaseWidget: QgsPanelWidget
diff --git a/src/gui/layout/qgslayoutitemwidget.cpp b/src/gui/layout/qgslayoutitemwidget.cpp
@@ -119,6 +119,11 @@ QgsLayoutAtlas *QgsLayoutConfigObject::layoutAtlas() const
   return printLayout->atlas();
 }
 
+void QgsLayoutConfigObject::setObject( QgsLayoutObject *object )
+{
+  mLayoutObject = object;
+}
+
 QgsVectorLayer *QgsLayoutConfigObject::coverageLayer() const
 {
   if ( !mLayoutObject )
@@ -321,6 +326,8 @@ void QgsLayoutItemPropertiesWidget::setItem( QgsLayoutItem *item )
     connect( mItem, &QgsLayoutObject::changed, this, &QgsLayoutItemPropertiesWidget::setValuesForGuiNonPositionElements );
   }
 
+  mConfigObject->setObject( mItem );
+
   setValuesForGuiElements();
 }
 
diff --git a/src/gui/layout/qgslayoutitemwidget.h b/src/gui/layout/qgslayoutitemwidget.h
@@ -86,6 +86,15 @@ class GUI_EXPORT QgsLayoutConfigObject: public QObject
     //! Returns the atlas for the layout, if available
     QgsLayoutAtlas *layoutAtlas() const;
 
+    /**
+     * Links a new layout \a object to this QgsLayoutConfigObject. The object must be the same type as the existing
+     * object.
+     *
+     * \note Not available in Python bindings
+     * \since QGIS 3.4
+     */
+    void setObject( QgsLayoutObject *object ) SIP_SKIP;
+
   private slots:
     //! Must be called when a data defined button changes
     void updateDataDefinedProperty();

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,11 @@ QgsLayoutAtlas *QgsLayoutConfigObject::layoutAtlas() const`
`119`	`119`	`return printLayout->atlas();`
`120`	`120`	`}`
`121`	`121`
	`122`	`+void QgsLayoutConfigObject::setObject( QgsLayoutObject *object )`
	`123`	`+{`
	`124`	`+ mLayoutObject = object;`
	`125`	`+}`
	`126`	`+`
`122`	`127`	`QgsVectorLayer *QgsLayoutConfigObject::coverageLayer() const`
`123`	`128`	`{`
`124`	`129`	`if ( !mLayoutObject )`
`@@ -321,6 +326,8 @@ void QgsLayoutItemPropertiesWidget::setItem( QgsLayoutItem *item )`
`321`	`326`	`connect( mItem, &QgsLayoutObject::changed, this, &QgsLayoutItemPropertiesWidget::setValuesForGuiNonPositionElements );`
`322`	`327`	`}`
`323`	`328`
	`329`	`+ mConfigObject->setObject( mItem );`
	`330`	`+`
`324`	`331`	`setValuesForGuiElements();`
`325`	`332`	`}`
`326`	`333`