[style dock] Fix display of extra pages

NathanW2 · NathanW2 · commit bf53e4ca0b6b · 2016-06-28T22:41:17.000+10:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5835,7 +5835,6 @@ void QgisApp::setMapStyleDockLayer( QgsMapLayer* layer )
   // the extra work if it's not needed
   if ( mMapStylingDock->isVisible() )
   {
-    mMapStyleWidget->setPageFactories( mMapStylePanelFactories );
     mMapStyleWidget->setLayer( layer );
   }
 }
@@ -9121,6 +9120,8 @@ void QgisApp::unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory*
 void QgisApp::registerMapStylePanelFactory( QgsLayerStylingPanelFactory *factory )
 {
   mMapStylePanelFactories << factory;
+  if ( mMapStyleWidget )
+    mMapStyleWidget->setPageFactories( mMapStylePanelFactories );
 }
 
 void QgisApp::unregisterMapStylePanelFactory( QgsLayerStylingPanelFactory *factory )
diff --git a/src/app/qgslayerstylingwidget.cpp b/src/app/qgslayerstylingwidget.cpp
@@ -70,6 +70,9 @@ QgsLayerStylingWidget::QgsLayerStylingWidget( QgsMapCanvas* canvas, QList<QgsLay
 
   mStyleManagerFactory = new QgsLayerStyleManagerWidgetFactory();
 
+  QList<QgsLayerStylingPanelFactory*> l;
+  setPageFactories( pages );
+
   connect( mUndoButton, SIGNAL( pressed() ), this, SLOT( undo() ) );
   connect( mRedoButton, SIGNAL( pressed() ), this, SLOT( redo() ) );
 
@@ -168,6 +171,7 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )
   {
     if ( factory->supportsLayer( layer ) )
     {
+      QgsDebugMsg( "MAKING PANEL" );
       QListWidgetItem* item =  new QListWidgetItem( factory->icon(), QString() );
       mOptionsListWidget->addItem( item );
       int row = mOptionsListWidget->row( item );

Original file line number	Diff line number	Diff line change
`@@ -5835,7 +5835,6 @@ void QgisApp::setMapStyleDockLayer( QgsMapLayer* layer )`
`5835`	`5835`	`// the extra work if it's not needed`
`5836`	`5836`	`if ( mMapStylingDock->isVisible() )`
`5837`	`5837`	`{`
`5838`		`- mMapStyleWidget->setPageFactories( mMapStylePanelFactories );`
`5839`	`5838`	`mMapStyleWidget->setLayer( layer );`
`5840`	`5839`	`}`
`5841`	`5840`	`}`
`@@ -9121,6 +9120,8 @@ void QgisApp::unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory*`
`9121`	`9120`	`void QgisApp::registerMapStylePanelFactory( QgsLayerStylingPanelFactory *factory )`
`9122`	`9121`	`{`
`9123`	`9122`	`mMapStylePanelFactories << factory;`
	`9123`	`+ if ( mMapStyleWidget )`
	`9124`	`+ mMapStyleWidget->setPageFactories( mMapStylePanelFactories );`
`9124`	`9125`	`}`
`9125`	`9126`
`9126`	`9127`	`void QgisApp::unregisterMapStylePanelFactory( QgsLayerStylingPanelFactory *factory )`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ QgsLayerStylingWidget::QgsLayerStylingWidget( QgsMapCanvas* canvas, QList<QgsLay`
`70`	`70`
`71`	`71`	`mStyleManagerFactory = new QgsLayerStyleManagerWidgetFactory();`
`72`	`72`
	`73`	`+ QList<QgsLayerStylingPanelFactory*> l;`
	`74`	`+ setPageFactories( pages );`
	`75`	`+`
`73`	`76`	`connect( mUndoButton, SIGNAL( pressed() ), this, SLOT( undo() ) );`
`74`	`77`	`connect( mRedoButton, SIGNAL( pressed() ), this, SLOT( redo() ) );`
`75`	`78`
`@@ -168,6 +171,7 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )`
`168`	`171`	`{`
`169`	`172`	`if ( factory->supportsLayer( layer ) )`
`170`	`173`	`{`
	`174`	`+ QgsDebugMsg( "MAKING PANEL" );`
`171`	`175`	`QListWidgetItem* item = new QListWidgetItem( factory->icon(), QString() );`
`172`	`176`	`mOptionsListWidget->addItem( item );`
`173`	`177`	`int row = mOptionsListWidget->row( item );`