hrev52062 adds 1 changeset to branch 'master'
old head: 382d022473c897734fed4ac99a647e0e02f51f5b
new head: f5face4114b1fad794b65e355b58586bad21713e
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=f5face4114b1+%5E382d022473c8
----------------------------------------------------------------------------
f5face4114b1: BListView: Fix drag n' drop in multi-select mode
Move list selection logic into MouseUp instead of MouseDown
Change-Id: I4e7c7f6636dabce130578777b5e1203d6695499a
Fixes #9190
[ David Murphy <murphman@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52062
Commit: f5face4114b1fad794b65e355b58586bad21713e
URL: https://git.haiku-os.org/haiku/commit/?id=f5face4114b1
Author: David Murphy <murphman@xxxxxxxxx>
Date: Mon Jul 2 17:07:05 2018 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Wed Jul 4 00:47:01 2018 UTC
Ticket: https://dev.haiku-os.org/ticket/9190
----------------------------------------------------------------------------
1 file changed, 20 insertions(+), 33 deletions(-)
src/kits/interface/ListView.cpp | 53 ++++++++++++++-----------------------
----------------------------------------------------------------------------
diff --git a/src/kits/interface/ListView.cpp b/src/kits/interface/ListView.cpp
index fcd870195b..73c16d9667 100644
--- a/src/kits/interface/ListView.cpp
+++ b/src/kits/interface/ListView.cpp
@@ -546,17 +546,8 @@ BListView::MouseDown(BPoint where)
Window()->UpdateIfNeeded();
}
- BMessage* message = Looper()->CurrentMessage();
int32 index = IndexOf(where);
- int32 buttons = 0;
- if (message != NULL)
- message->FindInt32("buttons", &buttons);
-
- int32 modifiers = 0;
- if (message != NULL)
- message->FindInt32("modifiers", &modifiers);
-
// If the user double (or more) clicked within the current selection,
// we don't change the selection but invoke the selection.
// TODO: move this code someplace where it can be shared everywhere
@@ -594,24 +585,38 @@ BListView::MouseDown(BPoint where)
&BListView::_DoneTracking, &BListView::_Track);
}
+ BView::MouseDown(where);
+}
+
+
+void
+BListView::MouseUp(BPoint where)
+{
+ int32 modifiers = 0;
+
+ BMessage* message = Looper()->CurrentMessage();
+ if (message != NULL)
+ message->FindInt32("modifiers", &modifiers);
+
+ // Evaluate selection based on the selected index
+ // at the time of the mouse starting to track.
+ // Otherwise we cannot properly handle dragging and dropping
+ // with multi-select list.
+ int32 index = fTrack->item_index;
if (index >= 0) {
if (fListType == B_MULTIPLE_SELECTION_LIST) {
if ((modifiers & B_SHIFT_KEY) != 0) {
// select entire block
- // TODO: maybe review if we want it like in
Tracker
- // (anchor item)
- if (index >= fFirstSelected && index <
fLastSelected) {
+ if (index >= fFirstSelected && index <
fLastSelected)
// clicked inside of selected items
block, deselect all
// but from the first selected item to
the clicked item
DeselectExcept(fFirstSelected, index);
- } else {
+ else
Select(std::min(index, fFirstSelected),
std::max(index,
fLastSelected));
- }
} else {
if ((modifiers & B_COMMAND_KEY) != 0) {
// toggle selection state of clicked
item (like in Tracker)
- // toggle selection state of clicked
item
if (ItemAt(index)->IsSelected())
Deselect(index);
else
@@ -629,13 +634,6 @@ BListView::MouseDown(BPoint where)
} else if ((modifiers & B_COMMAND_KEY) == 0)
DeselectAll();
- BView::MouseDown(where);
-}
-
-
-void
-BListView::MouseUp(BPoint where)
-{
BView::MouseUp(where);
}
@@ -1991,15 +1989,4 @@ BListView::_Track(BPoint where, uint32)
fTrack->item_index, fTrack->was_selected);
}
}
-
- if (!fTrack->is_dragging) {
- // do selection only if a drag was not initiated
- int32 index = IndexOf(where);
- BListItem* item = ItemAt(index);
- if (item != NULL && !item->IsSelected() && item->IsEnabled()) {
- Select(index, fListType == B_MULTIPLE_SELECTION_LIST
- && (modifiers() & B_SHIFT_KEY) != 0);
- ScrollToSelection();
- }
- }
}
