[haiku-commits] haiku: hrev52069 - src/kits/interface

  • From: waddlesplash <waddlesplash@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 5 Jul 2018 09:11:07 -0400 (EDT)

hrev52069 adds 1 changeset to branch 'master'
old head: 4e5f9d975331db5b0e5e4326d90fe6f6e75bd334
new head: e2d19ae5b7956bbe4a805e300d86d6454693ed23
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=e2d19ae5b795+%5E4e5f9d975331

----------------------------------------------------------------------------

e2d19ae5b795: BListView: do not modify selection on MouseUp if drag & drop
  
  bug seems to have been introduced only recently in hrev52062

                                     [ John Scipione <jscipione@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev52069
Commit:      e2d19ae5b7956bbe4a805e300d86d6454693ed23
URL:         https://git.haiku-os.org/haiku/commit/?id=e2d19ae5b795
Author:      John Scipione <jscipione@xxxxxxxxx>
Date:        Thu Jul  5 04:27:04 2018 UTC

----------------------------------------------------------------------------

1 file changed, 7 insertions(+), 1 deletion(-)
src/kits/interface/ListView.cpp | 8 +++++++-

----------------------------------------------------------------------------

diff --git a/src/kits/interface/ListView.cpp b/src/kits/interface/ListView.cpp
index 73c16d9667..47dee60791 100644
--- a/src/kits/interface/ListView.cpp
+++ b/src/kits/interface/ListView.cpp
@@ -592,6 +592,12 @@ BListView::MouseDown(BPoint where)
 void
 BListView::MouseUp(BPoint where)
 {
+       if (fTrack->is_dragging) {
+               // do selection only if a drag was not initiated
+               BView::MouseUp(where);
+               return;
+       }
+
        int32 modifiers = 0;
 
        BMessage* message = Looper()->CurrentMessage();
@@ -625,7 +631,7 @@ BListView::MouseUp(BPoint where)
                                        Select(index);
                        }
                } else {
-                       // toggle selection state of clicked item
+                       // toggle selection state of clicked item (except drag 
& drop)
                        if ((modifiers & B_COMMAND_KEY) != 0 && 
ItemAt(index)->IsSelected())
                                Deselect(index);
                        else


Other related posts:

  • » [haiku-commits] haiku: hrev52069 - src/kits/interface - waddlesplash