Mercurial > hg > tony

changeset 340:1277a5dd11f6

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 bcbad0f03f51 (current diff) 05449a49cbb4 (diff)
children 6b57c58b88d2
files .hgsubstate
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Fri Jun 13 17:39:01 2014 +0100
+++ b/.hgsubstate	Fri Jun 13 17:44:58 2014 +0100
@@ -4,4 +4,4 @@
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 5302c548adadd5e3ddb5fd2eafa45ce3033183e7 svapp
 defbe5bc47b78b19914b4091aa724f9e5d39e055 svcore
-edada332c374cbb70f2ec94b6abc7b0a3257ae2f svgui
+6eb0b20c940fe3475c3a847b10225ae720c7e958 svgui
--- a/src/MainWindow.cpp	Fri Jun 13 17:39:01 2014 +0100
+++ b/src/MainWindow.cpp	Fri Jun 13 17:44:58 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());
+        isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame()+1);
     }
     if (!doSelect || !isAtSelectionBoundary) {
         m_selectionAnchor = frame;
@@ -1257,9 +1257,9 @@
     if (doSelect) {
         Selection sel;
         if (frame > m_selectionAnchor) {
-            sel = Selection(m_selectionAnchor, frame);
+            sel = Selection(m_selectionAnchor, frame-1);
         } else {
-            sel = Selection(frame, m_selectionAnchor);
+            sel = Selection(frame, m_selectionAnchor-1);
         }
         m_viewManager->setSelection(sel);
     }