Fix for bug #442

mhugent · mhugent · commit 19d95b31a7ba · 2006-12-13T10:28:01.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@6249 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/legend/qgslegend.cpp b/src/legend/qgslegend.cpp
@@ -286,7 +286,8 @@ void QgsLegend::mouseReleaseEvent(QMouseEvent * e)
 
       if(!dest || !origin)
       {
-	  return;
+	checkLayerOrderUpdate();
+	return;
       }
 
       if(dest && origin && getItemPos(dest) != mItemBeingMovedOrigPos)
@@ -348,13 +349,7 @@ void QgsLegend::mouseReleaseEvent(QMouseEvent * e)
 		origLayer->setLegend((QgsLegend*)(dynamic_cast<QgsLegendItem*>(dest->parent())->nextSibling()));
 	      }
 	  }
-	
-	 std::deque<QString> layersAfterRelease = layerIDs(); //test if canvas redraw is really necessary
-   if(layersAfterRelease != mLayersPriorToMove)
-   {
-     // z-order has changed - update layer set
-     updateMapCanvasLayerSet();
-   }
+	checkLayerOrderUpdate();
       }
   }
   mMousePressedFlag = false;
@@ -1745,3 +1740,16 @@ void QgsLegend::zoomToLayerExtent()
   mMapCanvas->render();
   mMapCanvas->refresh();
 }
+
+
+bool QgsLegend::checkLayerOrderUpdate()
+{
+  std::deque<QString> layersAfterRelease = layerIDs(); //test if canvas redraw is really necessary
+  if(layersAfterRelease != mLayersPriorToMove)
+    {
+      // z-order has changed - update layer set
+      updateMapCanvasLayerSet();
+      return true;
+    }
+  return false;
+}
diff --git a/src/legend/qgslegend.h b/src/legend/qgslegend.h
@@ -251,6 +251,9 @@ this item may be moved back to the original position with resetToInitialPosition
   /**Checks mPixmapWidthValues and mPixmapHeightValues and sets a new icon size if necessary*/
   void adjustIconSize();
 
+  /**This function compares the layer order before a drag with the current layer ordering and triggers a canvas repaint if it has changed*/
+  bool checkLayerOrderUpdate();
+
   private slots:
 
   /**Calls 'handleRightClickEvent' on the item*/

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,8 @@ void QgsLegend::mouseReleaseEvent(QMouseEvent * e)`
`286`	`286`
`287`	`287`	`if(!dest \|\| !origin)`
`288`	`288`	`{`
`289`		`- return;`
	`289`	`+ checkLayerOrderUpdate();`
	`290`	`+ return;`
`290`	`291`	`}`
`291`	`292`
`292`	`293`	`if(dest && origin && getItemPos(dest) != mItemBeingMovedOrigPos)`
`@@ -348,13 +349,7 @@ void QgsLegend::mouseReleaseEvent(QMouseEvent * e)`
`348`	`349`	`origLayer->setLegend((QgsLegend)(dynamic_cast<QgsLegendItem>(dest->parent())->nextSibling()));`
`349`	`350`	`}`
`350`	`351`	`}`
`351`		`-`
`352`		`- std::deque<QString> layersAfterRelease = layerIDs(); //test if canvas redraw is really necessary`
`353`		`- if(layersAfterRelease != mLayersPriorToMove)`
`354`		`- {`
`355`		`- // z-order has changed - update layer set`
`356`		`- updateMapCanvasLayerSet();`
`357`		`- }`
	`352`	`+ checkLayerOrderUpdate();`
`358`	`353`	`}`
`359`	`354`	`}`
`360`	`355`	`mMousePressedFlag = false;`
`@@ -1745,3 +1740,16 @@ void QgsLegend::zoomToLayerExtent()`
`1745`	`1740`	`mMapCanvas->render();`
`1746`	`1741`	`mMapCanvas->refresh();`
`1747`	`1742`	`}`
	`1743`	`+`
	`1744`	`+`
	`1745`	`+bool QgsLegend::checkLayerOrderUpdate()`
	`1746`	`+{`
	`1747`	`+ std::deque<QString> layersAfterRelease = layerIDs(); //test if canvas redraw is really necessary`
	`1748`	`+ if(layersAfterRelease != mLayersPriorToMove)`
	`1749`	`+ {`
	`1750`	`+ // z-order has changed - update layer set`
	`1751`	`+ updateMapCanvasLayerSet();`
	`1752`	`+ return true;`
	`1753`	`+ }`
	`1754`	`+ return false;`
	`1755`	`+}`