mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-07 00:15:48 -04:00
Fix raster style dock widgets not opened with dock mode flag
Makes the color picker and ramp editors open inline for the raster properties pages
This commit is contained in:
parent
3e1536f1da
commit
79fd6fa0ac
@ -334,6 +334,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
|
|||||||
if ( panel )
|
if ( panel )
|
||||||
{
|
{
|
||||||
connect( panel, SIGNAL( widgetChanged( QgsPanelWidget* ) ), this, SLOT( autoApply() ) );
|
connect( panel, SIGNAL( widgetChanged( QgsPanelWidget* ) ), this, SLOT( autoApply() ) );
|
||||||
|
panel->setDockMode( true );
|
||||||
mWidgetStack->addMainPanel( panel );
|
mWidgetStack->addMainPanel( panel );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -385,12 +386,14 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
|
|||||||
{
|
{
|
||||||
case 0: // Style
|
case 0: // Style
|
||||||
mRasterStyleWidget = new QgsRendererRasterPropertiesWidget( rlayer, mMapCanvas, mWidgetStack );
|
mRasterStyleWidget = new QgsRendererRasterPropertiesWidget( rlayer, mMapCanvas, mWidgetStack );
|
||||||
|
mRasterStyleWidget->setDockMode( true );
|
||||||
connect( mRasterStyleWidget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );
|
connect( mRasterStyleWidget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );
|
||||||
mWidgetStack->addMainPanel( mRasterStyleWidget );
|
mWidgetStack->addMainPanel( mRasterStyleWidget );
|
||||||
break;
|
break;
|
||||||
case 1: // Transparency
|
case 1: // Transparency
|
||||||
{
|
{
|
||||||
QgsRasterTransparencyWidget* transwidget = new QgsRasterTransparencyWidget( rlayer, mMapCanvas, mWidgetStack );
|
QgsRasterTransparencyWidget* transwidget = new QgsRasterTransparencyWidget( rlayer, mMapCanvas, mWidgetStack );
|
||||||
|
transwidget->setDockMode( true );
|
||||||
connect( transwidget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );
|
connect( transwidget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );
|
||||||
mWidgetStack->addMainPanel( transwidget );
|
mWidgetStack->addMainPanel( transwidget );
|
||||||
break;
|
break;
|
||||||
@ -412,6 +415,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
|
|||||||
connect( widget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );
|
connect( widget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );
|
||||||
QString name = mRasterStyleWidget->currentRenderWidget()->renderer()->type();
|
QString name = mRasterStyleWidget->currentRenderWidget()->renderer()->type();
|
||||||
widget->setRendererWidget( name, mRasterStyleWidget->currentRenderWidget() );
|
widget->setRendererWidget( name, mRasterStyleWidget->currentRenderWidget() );
|
||||||
|
widget->setDockMode( true );
|
||||||
|
|
||||||
mWidgetStack->addMainPanel( widget );
|
mWidgetStack->addMainPanel( widget );
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user