Mercurial > hg > tony

changeset 344:80f2cd8a30f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Mon, 16 Jun 2014 11:49:05 +0100
parents 6d9adf82347d (current diff) 6f545a46746b (diff)
children 65907d91f328 ff00432761ce
files .hgsubstate src/MainWindow.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Mon Jun 16 11:45:57 2014 +0100
+++ b/.hgsubstate	Mon Jun 16 11:49:05 2014 +0100
@@ -4,4 +4,4 @@
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 f5c914661f6fdc7f05c2c980b0d21350d5933428 svapp
 3efc20c59a947a137ed7fc715b2a3b0de6c02200 svcore
-102ffad481e6cf8d8cdf6dc42f09bc9593ec4c6d svgui
+8be221f1831388b523b88a74fb2e3d30d2d23291 svgui
--- a/src/MainWindow.cpp	Mon Jun 16 11:45:57 2014 +0100
+++ b/src/MainWindow.cpp	Mon Jun 16 11:49:05 2014 +0100
@@ -1222,7 +1222,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;
@@ -1264,9 +1264,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);
     }