Fix raster style dock widgets not opened with dock mode flag

nyalldawson · nyalldawson · commit 7eccb43c7892 · 2016-10-06T21:09:01.000+10:00
Makes the color picker open inline for the raster properties pages (cherry-picked from 79fd6fa)
diff --git a/src/app/qgslayerstylingwidget.cpp b/src/app/qgslayerstylingwidget.cpp
@@ -332,6 +332,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
     if ( panel )
     {
       connect( panel, SIGNAL( widgetChanged( QgsPanelWidget* ) ), this, SLOT( autoApply() ) );
+      panel->setDockMode( true );
       mWidgetStack->addMainPanel( panel );
     }
   }
@@ -383,12 +384,14 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
     {
       case 0: // Style
         mRasterStyleWidget = new QgsRendererRasterPropertiesWidget( rlayer, mMapCanvas, mWidgetStack );
+        mRasterStyleWidget->setDockMode( true );
         connect( mRasterStyleWidget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );
         mWidgetStack->addMainPanel( mRasterStyleWidget );
         break;
       case 1: // Transparency
       {
         QgsRasterTransparencyWidget* transwidget = new QgsRasterTransparencyWidget( rlayer, mMapCanvas, mWidgetStack );
+        transwidget->setDockMode( true );
         connect( transwidget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );
         mWidgetStack->addMainPanel( transwidget );
         break;
@@ -410,6 +413,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
           connect( widget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );
           QString name = mRasterStyleWidget->currentRenderWidget()->renderer()->type();
           widget->setRendererWidget( name, mRasterStyleWidget->currentRenderWidget() );
+          widget->setDockMode( true );
 
           mWidgetStack->addMainPanel( widget );
         }

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()`
`332`	`332`	`if ( panel )`
`333`	`333`	`{`
`334`	`334`	`connect( panel, SIGNAL( widgetChanged( QgsPanelWidget* ) ), this, SLOT( autoApply() ) );`
	`335`	`+ panel->setDockMode( true );`
`335`	`336`	`mWidgetStack->addMainPanel( panel );`
`336`	`337`	`}`
`337`	`338`	`}`
`@@ -383,12 +384,14 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()`
`383`	`384`	`{`
`384`	`385`	`case 0: // Style`
`385`	`386`	`mRasterStyleWidget = new QgsRendererRasterPropertiesWidget( rlayer, mMapCanvas, mWidgetStack );`
	`387`	`+ mRasterStyleWidget->setDockMode( true );`
`386`	`388`	`connect( mRasterStyleWidget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );`
`387`	`389`	`mWidgetStack->addMainPanel( mRasterStyleWidget );`
`388`	`390`	`break;`
`389`	`391`	`case 1: // Transparency`
`390`	`392`	`{`
`391`	`393`	`QgsRasterTransparencyWidget* transwidget = new QgsRasterTransparencyWidget( rlayer, mMapCanvas, mWidgetStack );`
	`394`	`+ transwidget->setDockMode( true );`
`392`	`395`	`connect( transwidget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );`
`393`	`396`	`mWidgetStack->addMainPanel( transwidget );`
`394`	`397`	`break;`
`@@ -410,6 +413,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()`
`410`	`413`	`connect( widget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );`
`411`	`414`	`QString name = mRasterStyleWidget->currentRenderWidget()->renderer()->type();`
`412`	`415`	`widget->setRendererWidget( name, mRasterStyleWidget->currentRenderWidget() );`
	`416`	`+ widget->setDockMode( true );`
`413`	`417`
`414`	`418`	`mWidgetStack->addMainPanel( widget );`
`415`	`419`	`}`