Mercurial > hg > tony

changeset 342:6f545a46746b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed deleteSelectionInclusive to not delete adjacent notes
author matthiasm
date Mon, 16 Jun 2014 11:44:14 +0100
parents 6b57c58b88d2
children 80f2cd8a30f7 f3a9e4abec1b
files .hgsubstate src/MainWindow.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Mon Jun 16 09:28:12 2014 +0100
+++ b/.hgsubstate	Mon Jun 16 11:44:14 2014 +0100
@@ -4,4 +4,4 @@
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 f5c914661f6fdc7f05c2c980b0d21350d5933428 svapp
 85879408f6657f4076d73839d590c9fb80b78e73 svcore
-6eb0b20c940fe3475c3a847b10225ae720c7e958 svgui
+d6b79166ae0d6dcf0ed55aba08f50fdfcd229647 svgui
--- a/src/MainWindow.cpp	Mon Jun 16 09:28:12 2014 +0100
+++ b/src/MainWindow.cpp	Mon Jun 16 11:44:14 2014 +0100
@@ -1215,7 +1215,7 @@
     MultiSelection::SelectionList selections = m_viewManager->getSelections();
     if (!selections.empty()) {
         Selection sel = *selections.begin();
-        isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame()+1);
+        isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame());
     }
     if (!doSelect || !isAtSelectionBoundary) {
         m_selectionAnchor = frame;
@@ -1257,9 +1257,9 @@
     if (doSelect) {
         Selection sel;
         if (frame > m_selectionAnchor) {
-            sel = Selection(m_selectionAnchor, frame-1);
+            sel = Selection(m_selectionAnchor, frame);
         } else {
-            sel = Selection(frame, m_selectionAnchor-1);
+            sel = Selection(frame, m_selectionAnchor);
         }
         m_viewManager->setSelection(sel);
     }