Skip to content

Commit 26b4ee6

Browse files
committedJun 5, 2019
Fix inverted polygon renderer widget not opening colors and other
panels inline in style dock
1 parent 820f792 commit 26b4ee6

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed
 

‎python/gui/auto_generated/symbology/qgsinvertedpolygonrendererwidget.sip.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ Constructor
4545
virtual void setContext( const QgsSymbolWidgetContext &context );
4646

4747

48+
virtual void setDockMode( bool dockMode );
49+
50+
4851
protected:
4952

5053
};

‎src/gui/symbology/qgsinvertedpolygonrendererwidget.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,13 @@ void QgsInvertedPolygonRendererWidget::setContext( const QgsSymbolWidgetContext
119119
mEmbeddedRendererWidget->setContext( context );
120120
}
121121

122+
void QgsInvertedPolygonRendererWidget::setDockMode( bool dockMode )
123+
{
124+
QgsRendererWidget::setDockMode( dockMode );
125+
if ( mEmbeddedRendererWidget )
126+
mEmbeddedRendererWidget->setDockMode( dockMode );
127+
}
128+
122129
void QgsInvertedPolygonRendererWidget::mRendererComboBox_currentIndexChanged( int index )
123130
{
124131
QString rendererId = mRendererComboBox->itemData( index ).toString();
@@ -128,6 +135,8 @@ void QgsInvertedPolygonRendererWidget::mRendererComboBox_currentIndexChanged( in
128135
mEmbeddedRendererWidget.reset( m->createRendererWidget( mLayer, mStyle, const_cast<QgsFeatureRenderer *>( mRenderer->embeddedRenderer() )->clone() ) );
129136
connect( mEmbeddedRendererWidget.get(), &QgsRendererWidget::widgetChanged, this, &QgsInvertedPolygonRendererWidget::widgetChanged );
130137
mEmbeddedRendererWidget->setContext( mContext );
138+
mEmbeddedRendererWidget->setDockMode( this->dockMode() );
139+
connect( mEmbeddedRendererWidget.get(), &QgsPanelWidget::showPanel, this, &QgsPanelWidget::openPanel );
131140

132141
if ( layout()->count() > 2 )
133142
{

‎src/gui/symbology/qgsinvertedpolygonrendererwidget.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ class GUI_EXPORT QgsInvertedPolygonRendererWidget : public QgsRendererWidget, pr
5555

5656
void setContext( const QgsSymbolWidgetContext &context ) override;
5757

58+
void setDockMode( bool dockMode ) override;
59+
5860
protected:
5961
//! The mask renderer
6062
std::unique_ptr<QgsInvertedPolygonRenderer> mRenderer;

0 commit comments

Comments
 (0)
Please sign in to comment.