patch_for_bug_1745.txt
| 1 |
Index: qgslegend.cpp |
|---|---|
| 2 |
=================================================================== |
| 3 |
--- qgslegend.cpp (revisi?n: 10966) |
| 4 |
+++ qgslegend.cpp (copia de trabajo) |
| 5 |
@@ -255,20 +255,27 @@ |
| 6 |
if ( action == QgsLegendItem::REORDER || action == QgsLegendItem::INSERT ) |
| 7 |
{
|
| 8 |
QgsDebugMsg( "mouseMoveEvent::REORDER/INSERT top half" ); |
| 9 |
- if ( origin->nextSibling() != dest ) |
| 10 |
+ if ( origin->type() == QgsLegendItem::LEGEND_LAYER_FILE && dest->type() == QgsLegendItem::LEGEND_LAYER_FILE_GROUP) |
| 11 |
{
|
| 12 |
- if ( origin->parent() != dest->parent() ) |
| 13 |
+ setCursor( QCursor( Qt::ForbiddenCursor ) ); |
| 14 |
+ } |
| 15 |
+ else |
| 16 |
+ {
|
| 17 |
+ if ( origin->nextSibling() != dest ) |
| 18 |
{
|
| 19 |
- moveItem( origin, dest ); |
| 20 |
- moveItem( dest, origin ); |
| 21 |
+ if ( origin->parent() != dest->parent() ) |
| 22 |
+ {
|
| 23 |
+ moveItem( origin, dest ); |
| 24 |
+ moveItem( dest, origin ); |
| 25 |
+ } |
| 26 |
+ else |
| 27 |
+ {
|
| 28 |
+ moveItem( dest, origin ); |
| 29 |
+ } |
| 30 |
} |
| 31 |
- else |
| 32 |
- {
|
| 33 |
- moveItem( dest, origin ); |
| 34 |
- } |
| 35 |
+ setCursor( QCursor( Qt::SizeVerCursor ) ); |
| 36 |
+ setCurrentItem( origin ); |
| 37 |
} |
| 38 |
- setCursor( QCursor( Qt::SizeVerCursor ) ); |
| 39 |
- setCurrentItem( origin ); |
| 40 |
} |
| 41 |
else |
| 42 |
{
|