Ensure color selectors open inline

qgis · Dec 9, 2020 · 5558774 · 5558774
1 parent 15da73a
commit 5558774
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/src/app/3d/qgspointcloud3dsymbolwidget.cpp b/src/app/3d/qgspointcloud3dsymbolwidget.cpp
@@ -173,6 +173,12 @@ void QgsPointCloud3DSymbolWidget::setSymbol( QgsPointCloud3DSymbol *symbol )
   mBlockChangedSignals--;
 }
 
+void QgsPointCloud3DSymbolWidget::setDockMode( bool dockMode )
+{
+  if ( mClassifiedRendererWidget )
+    mClassifiedRendererWidget->setDockMode( dockMode );
+}
+
 QgsPointCloud3DSymbol *QgsPointCloud3DSymbolWidget::symbol() const
 {
   QgsPointCloud3DSymbol *retSymb = nullptr;
@@ -578,3 +584,8 @@ double QgsPointCloud3DSymbolWidget::showBoundingBoxes() const
 {
   return mShowBoundingBoxesCheckBox->isChecked();
 }
+
+void QgsPointCloud3DSymbolWidget::connectChildPanels( QgsPanelWidget *parent )
+{
+  parent->connectChildPanel( mClassifiedRendererWidget );
+}
diff --git a/src/app/3d/qgspointcloud3dsymbolwidget.h b/src/app/3d/qgspointcloud3dsymbolwidget.h
@@ -32,13 +32,17 @@ class QgsPointCloud3DSymbolWidget : public QWidget, private Ui::QgsPointCloud3DS
 
     void setSymbol( QgsPointCloud3DSymbol *symbol );
 
+    void setDockMode( bool dockMode );
+
     QgsPointCloud3DSymbol *symbol() const;
 
     void setMaximumScreenError( double maxScreenError );
     double maximumScreenError() const;
     void setShowBoundingBoxes( bool showBoundingBoxes );
     double showBoundingBoxes() const;
 
+    void connectChildPanels( QgsPanelWidget *parent );
+
   private slots:
     void reloadColorRampShaderMinMax();
     void onRenderingStyleChanged();

diff --git a/src/app/3d/qgspointcloudlayer3drendererwidget.cpp b/src/app/3d/qgspointcloudlayer3drendererwidget.cpp
@@ -35,6 +35,8 @@ QgsPointCloudLayer3DRendererWidget::QgsPointCloudLayer3DRendererWidget( QgsPoint
   mWidgetPointCloudSymbol = new QgsPointCloud3DSymbolWidget( layer, nullptr, this );
   layout->addWidget( mWidgetPointCloudSymbol );
 
+  mWidgetPointCloudSymbol->connectChildPanels( this );
+
   connect( mWidgetPointCloudSymbol, &QgsPointCloud3DSymbolWidget::changed, this, &QgsPointCloudLayer3DRendererWidget::widgetChanged );
 }
 
@@ -85,6 +87,14 @@ void QgsPointCloudLayer3DRendererWidget::syncToLayer( QgsMapLayer *layer )
   }
 }
 
+void QgsPointCloudLayer3DRendererWidget::setDockMode( bool dockMode )
+{
+  QgsMapLayerConfigWidget::setDockMode( dockMode );
+
+  if ( mWidgetPointCloudSymbol )
+    mWidgetPointCloudSymbol->setDockMode( dockMode );
+}
+
 QgsPointCloudLayer3DRendererWidgetFactory::QgsPointCloudLayer3DRendererWidgetFactory( QObject *parent ):
   QObject( parent )
 {

diff --git a/src/app/3d/qgspointcloudlayer3drendererwidget.h b/src/app/3d/qgspointcloudlayer3drendererwidget.h
@@ -37,12 +37,14 @@ class QgsPointCloudLayer3DRendererWidget : public QgsMapLayerConfigWidget
     explicit QgsPointCloudLayer3DRendererWidget( QgsPointCloudLayer *layer, QgsMapCanvas *canvas, QWidget *parent = nullptr );
 
     void syncToLayer( QgsMapLayer *layer ) override;
+    void setDockMode( bool dockMode ) override;
 
     //! no transfer of ownership
     void setRenderer( const QgsPointCloudLayer3DRenderer *renderer );
     //! no transfer of ownership
     QgsPointCloudLayer3DRenderer *renderer();
 
+
   public slots:
     void apply() override;