[layouts] Final fixes for data defined widgets showing outdated

data defined definitions when clicking between layout items of the same type Fixes #18694
qgis · Oct 26, 2018 · bbdbfa1 · bbdbfa1
1 parent 5e3fdb9
commit bbdbfa1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
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();