Changeset 2455

Timestamp:

02/16/12 23:13:59 (15 months ago)

Author:

mauser

Message:

Bugfix for #238: Moving cells in the songeditor

Files:

• trunk/src/gui/src/SongEditor/SongEditor.cpp (modified) (1 diff)

trunk/src/gui/src/SongEditor/SongEditor.cpp

@@ -533 +533 @@
                          */
 
-                        bool moved = false;
-                        for ( uint i = 0; i < movingCells.size(); i++ ) {
-                                QPoint cell2 = movingCells[ i ];
-                                if(cell.x() == cell2.x()){
-                                        moved = true;   
-                                }
-                        }
-
-                        if( moved )
-                        {
-                                continue;
-                        }
-
-                        if( undo )
-                        {
-                            bool existing = false;
-                            for ( uint i = 0; i < existingCells.size(); i++ ) {
-                                QPoint existing_cell = existingCells[ i ];
-                                if(existing_cell.x() == cell.x() && existing_cell.y() == cell.y()) existing = true;
-                            }
-
-                            //this cell existed before. Don't delete it!
-                            if(existing){
-                                continue;
-                            }
-                        }
-                        
-
-                        if ( cell.x() < (int)pColumns->size() ) {
-                                pColumn = (*pColumns)[ cell.x() ];
-                        }
-                        else {
-                                pColumn = new PatternList();
-                                pColumns->push_back( pColumn );
-                        }
-                        pColumn->del(pPatternList->get( cell.y() ) );
-                }
+            bool moved = false;
+            for ( uint i = 0; i < movingCells.size(); i++ ) {
+                QPoint cell2 = movingCells[ i ];
+                if( cell.x() == cell2.x() && cell.y() == cell2.y() ){
+                    moved = true;
+                }
+            }
+
+            if( moved )
+            {
+                continue;
+            }
+
+            if( undo )
+            {
+                bool existing = false;
+                for ( uint i = 0; i < existingCells.size(); i++ ) {
+                    QPoint existing_cell = existingCells[ i ];
+                    if(existing_cell.x() == cell.x() && existing_cell.y() == cell.y()) existing = true;
+                }
+
+                //this cell existed before. Don't delete it!
+                if(existing){
+                    continue;
+                }
+            }
+
+
+            if ( cell.x() < (int)pColumns->size() ) {
+                pColumn = (*pColumns)[ cell.x() ];
+            }
+            else {
+                pColumn = new PatternList();
+                pColumns->push_back( pColumn );
+            }
+            pColumn->del(pPatternList->get( cell.y() ) );
+        }
         }