don't allow dropping layers into legend classes

jef · jef · commit 493aff400094 · 2010-10-20T10:02:13.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14420 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -321,9 +321,10 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
   updateLineWidget();
   scrollToItem( item );
 
+  mDropTarget = 0;
+
   if ( item )
   {
-    mDropTarget = item;
     showItem( "moveMoveEvent" , item );
 
     QgsLegendItem  *litem = dynamic_cast<QgsLegendGroup *>( item );
@@ -341,6 +342,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
         showLine( line_y, line_left );
         setCursor( QCursor( Qt::SizeVerCursor ) );
 
+        mDropTarget = item;
         mDropAction = BEFORE;
       }
       else // below center of item
@@ -354,6 +356,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
           showLine( line_y, line_left );
           setCursor( QCursor( Qt::SizeVerCursor ) );
 
+          mDropTarget = item;
           mDropAction = INSERT;
         }
         else
@@ -362,6 +365,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
           showLine( line_y, line_left );
           setCursor( QCursor( Qt::SizeVerCursor ) );
 
+          mDropTarget = item;
           mDropAction = AFTER;
         }
       }
@@ -389,7 +393,6 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
   else
   {
     QgsDebugMsg( "No item here" );
-    mDropTarget = NULL;
     setCursor( QCursor( Qt::ForbiddenCursor ) );
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -321,9 +321,10 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )`
`321`	`321`	`updateLineWidget();`
`322`	`322`	`scrollToItem( item );`
`323`	`323`
	`324`	`+ mDropTarget = 0;`
	`325`	`+`
`324`	`326`	`if ( item )`
`325`	`327`	`{`
`326`		`- mDropTarget = item;`
`327`	`328`	`showItem( "moveMoveEvent" , item );`
`328`	`329`
`329`	`330`	`QgsLegendItem litem = dynamic_cast<QgsLegendGroup >( item );`
`@@ -341,6 +342,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )`
`341`	`342`	`showLine( line_y, line_left );`
`342`	`343`	`setCursor( QCursor( Qt::SizeVerCursor ) );`
`343`	`344`
	`345`	`+ mDropTarget = item;`
`344`	`346`	`mDropAction = BEFORE;`
`345`	`347`	`}`
`346`	`348`	`else // below center of item`
`@@ -354,6 +356,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )`
`354`	`356`	`showLine( line_y, line_left );`
`355`	`357`	`setCursor( QCursor( Qt::SizeVerCursor ) );`
`356`	`358`
	`359`	`+ mDropTarget = item;`
`357`	`360`	`mDropAction = INSERT;`
`358`	`361`	`}`
`359`	`362`	`else`
`@@ -362,6 +365,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )`
`362`	`365`	`showLine( line_y, line_left );`
`363`	`366`	`setCursor( QCursor( Qt::SizeVerCursor ) );`
`364`	`367`
	`368`	`+ mDropTarget = item;`
`365`	`369`	`mDropAction = AFTER;`
`366`	`370`	`}`
`367`	`371`	`}`
`@@ -389,7 +393,6 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )`
`389`	`393`	`else`
`390`	`394`	`{`
`391`	`395`	`QgsDebugMsg( "No item here" );`
`392`		`- mDropTarget = NULL;`
`393`	`396`	`setCursor( QCursor( Qt::ForbiddenCursor ) );`
`394`	`397`	`}`
`395`	`398`	`}`