comparison layer/FlexiNoteLayer.cpp @ 798:6eb0b20c940f tonioni

Merge

     FlexiNoteModel::PointList points =
         m_model->getPoints(s.getStartFrame(), s.getEndFrame());
 
     for (FlexiNoteModel::PointList::iterator i = points.begin();
          i != points.end(); ++i) {
-        bool overlap = !(((s.getStartFrame() < i->frame) && (s.getEndFrame() < i->frame))
-            || ((s.getStartFrame() > i->frame+i->duration) && (s.getEndFrame() > i->frame+i->duration)));
+        bool overlap = !(
+            ((s.getStartFrame() < i->frame) && (s.getEndFrame() < i->frame)) || // selection is left of note
+            ((s.getStartFrame() > (i->frame+i->duration-1)) && (s.getEndFrame() > (i->frame+i->duration-1))) // selection is right of note
+            );
         if (overlap) {
             command->deletePoint(*i);
         }
     }