Mercurial > hg > tony
comparison src/MainWindow.cpp @ 342:6f545a46746b
fixed deleteSelectionInclusive to not delete adjacent notes
author | matthiasm |
---|---|
date | Mon, 16 Jun 2014 11:44:14 +0100 |
parents | 05449a49cbb4 |
children | 80f2cd8a30f7 f3a9e4abec1b |
comparison
equal
deleted
inserted
replaced
341:6b57c58b88d2 | 342:6f545a46746b |
---|---|
1213 | 1213 |
1214 bool isAtSelectionBoundary = false; | 1214 bool isAtSelectionBoundary = false; |
1215 MultiSelection::SelectionList selections = m_viewManager->getSelections(); | 1215 MultiSelection::SelectionList selections = m_viewManager->getSelections(); |
1216 if (!selections.empty()) { | 1216 if (!selections.empty()) { |
1217 Selection sel = *selections.begin(); | 1217 Selection sel = *selections.begin(); |
1218 isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame()+1); | 1218 isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame()); |
1219 } | 1219 } |
1220 if (!doSelect || !isAtSelectionBoundary) { | 1220 if (!doSelect || !isAtSelectionBoundary) { |
1221 m_selectionAnchor = frame; | 1221 m_selectionAnchor = frame; |
1222 } | 1222 } |
1223 | 1223 |
1255 frame = *i2; | 1255 frame = *i2; |
1256 m_viewManager->setPlaybackFrame(frame); | 1256 m_viewManager->setPlaybackFrame(frame); |
1257 if (doSelect) { | 1257 if (doSelect) { |
1258 Selection sel; | 1258 Selection sel; |
1259 if (frame > m_selectionAnchor) { | 1259 if (frame > m_selectionAnchor) { |
1260 sel = Selection(m_selectionAnchor, frame-1); | 1260 sel = Selection(m_selectionAnchor, frame); |
1261 } else { | 1261 } else { |
1262 sel = Selection(frame, m_selectionAnchor-1); | 1262 sel = Selection(frame, m_selectionAnchor); |
1263 } | 1263 } |
1264 m_viewManager->setSelection(sel); | 1264 m_viewManager->setSelection(sel); |
1265 } | 1265 } |
1266 cerr << "MainWindow::moveByOneNote endframe: " << frame << endl; | 1266 cerr << "MainWindow::moveByOneNote endframe: " << frame << endl; |
1267 } | 1267 } |