enabled call to render() in zoomToSelected and made icon size in legend smaller

mhugent · mhugent · commit 4db347158a0a · 2006-01-20T21:50:22.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@4709 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1219,7 +1219,7 @@ void QgsMapCanvas::zoomToSelected()
       clear();
       // For Qt4, deprecate direct calling of render().  Let render() be called by the 
       // paint event loop of this widget.
-      //      render();
+      render();
       update();
       return;
     }
diff --git a/src/legend/qgslegend.cpp b/src/legend/qgslegend.cpp
@@ -66,7 +66,7 @@ QgsLegend::QgsLegend(QgisApp* app, QWidget * parent, const char *name)
   QFont f("Arial", 10, QFont::Normal);
   setFont(f);
   setBackgroundColor(QColor(192, 192, 192));
-  setIconSize(QSize(30, 30));
+  //setIconSize(QSize(30, 30));
   setColumnCount(1);
   QStringList myList("Layers");
   setHeaderLabels(myList);
@@ -870,7 +870,12 @@ bool QgsLegend::readXML(QDomNode& legendnode)
 		      theLegendLayerFile->setCheckState(0, Qt::Unchecked);
 		    }
 		  blockSignals(false);
-
+		  
+		  //set the layer type icon if this legendlayerfile is the last in the file group
+		  if(child.nextSibling().isNull())
+		  {
+		    static_cast<QgsLegendLayer*>(theLegendLayerFile->parent()->parent())->setLayerTypeIcon();
+		  }
 		}
 	    }
 	  else if(childelem.tagName()=="filegroup")

Original file line number	Diff line number	Diff line change
`@@ -1219,7 +1219,7 @@ void QgsMapCanvas::zoomToSelected()`
`1219`	`1219`	`clear();`
`1220`	`1220`	`// For Qt4, deprecate direct calling of render(). Let render() be called by the`
`1221`	`1221`	`// paint event loop of this widget.`
`1222`		`- // render();`
	`1222`	`+ render();`
`1223`	`1223`	`update();`
`1224`	`1224`	`return;`
`1225`	`1225`	`}`