[QGIS Commit] r14420 - trunk/qgis/src/app/legend

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-10-20 03:02:13 -0700 (Wed, 20 Oct 2010)
New Revision: 14420

Modified:
   trunk/qgis/src/app/legend/qgslegend.cpp
Log:
don't allow dropping layers into legend classes

Modified: trunk/qgis/src/app/legend/qgslegend.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegend.cpp	2010-10-20 07:46:57 UTC (rev 14419)
+++ trunk/qgis/src/app/legend/qgslegend.cpp	2010-10-20 10:02:13 UTC (rev 14420)
@@ -321,9 +321,10 @@
   updateLineWidget();
   scrollToItem( item );
 
+  mDropTarget = 0;
+
   if ( item )
   {
-    mDropTarget = item;
     showItem( "moveMoveEvent" , item );
 
     QgsLegendItem  *litem = dynamic_cast<QgsLegendGroup *>( item );
@@ -341,6 +342,7 @@
         showLine( line_y, line_left );
         setCursor( QCursor( Qt::SizeVerCursor ) );
 
+        mDropTarget = item;
         mDropAction = BEFORE;
       }
       else // below center of item
@@ -354,6 +356,7 @@
           showLine( line_y, line_left );
           setCursor( QCursor( Qt::SizeVerCursor ) );
 
+          mDropTarget = item;
           mDropAction = INSERT;
         }
         else
@@ -362,6 +365,7 @@
           showLine( line_y, line_left );
           setCursor( QCursor( Qt::SizeVerCursor ) );
 
+          mDropTarget = item;
           mDropAction = AFTER;
         }
       }
@@ -389,7 +393,6 @@
   else
   {
     QgsDebugMsg( "No item here" );
-    mDropTarget = NULL;
     setCursor( QCursor( Qt::ForbiddenCursor ) );
   }
 }