Mercurial > hg > svgui

changeset 798:6eb0b20c940f tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Fri, 13 Jun 2014 17:44:58 +0100
parents edada332c374 (current diff) 7717751f4407 (diff)
children d6b79166ae0d 102ffad481e6
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/layer/FlexiNoteLayer.cpp	Fri Jun 13 17:39:01 2014 +0100
+++ b/layer/FlexiNoteLayer.cpp	Fri Jun 13 17:44:58 2014 +0100
@@ -1666,8 +1666,10 @@
 
     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);
         }