i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BListView: Fix crashes on MouseUp in Genio and Icon-O-Matic

Browse Source 
... and others and double check for valid items on MouseMoved().

Bail out if drag item is invalid instead of deselecting.
Make sure that the item is valid before deselecting it.

Fixes #18707 #18716

Change-Id: Ic115f713f2aef7dfebafd23bc3107106b9128b8a
Reviewed-on: https://review.haiku-os.org/c/haiku/+/7243
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
John Scipione
2023-12-27 21:14:28 +00:00
committed by waddlesplash
parent 6307bc5739
commit 488ab9b45f
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/ListView.cpp
+21 -15
View File
@@ -690,15 +690,16 @@ BListView::MouseUp(BPoint where)
if (index == -1)
index = fTrack->item_index;
// if mouse down selection also invalid deselect all
if (index == -1) {
DeselectAll();
// bail out if mouse down selection invalid
if (index == -1)
return BView::MouseUp(where);
}
// undo fake selection and select item
ItemAt(index)->Deselect();
_DoSelection(index);
BListItem* item = ItemAt(index);
if (item != NULL) {
item->Deselect();
_DoSelection(index);
}
BView::MouseUp(where);
}
@@ -736,24 +737,29 @@ BListView::MouseMoved(BPoint where, uint32 code, const BMessage* dragMessage)
index = CountItems() - 1;
}
// don't scroll if button not pressed, no selection or same item
// don't scroll if button not pressed or index is invalid
int32 lastIndex = fFirstSelected;
if (buttons == 0 || index == -1 || lastIndex == -1 || index == lastIndex)
if (buttons == 0 || index == -1)
return BView::MouseMoved(where, code, dragMessage);
// scroll to item under mouse while button is pressed
ScrollTo(index);
if (!fTrack->is_dragging && fListType != B_MULTIPLE_SELECTION_LIST) {
if (!fTrack->is_dragging && fListType != B_MULTIPLE_SELECTION_LIST
&& lastIndex != -1 && index != lastIndex) {
// mouse moved over unselected item, fake selection until mouse up
ItemAt(lastIndex)->Deselect();
ItemAt(index)->Select();
BListItem* last = ItemAt(lastIndex);
BListItem* item = ItemAt(index);
if (last != NULL && item != NULL) {
last->Deselect();
item->Select();
// update selection index
fFirstSelected = fLastSelected = index;
// update selection index
fFirstSelected = fLastSelected = index;
// redraw items whose selection has changed
Invalidate(ItemFrame(lastIndex) | ItemFrame(index));
// redraw items whose selection has changed
Invalidate(ItemFrame(lastIndex) | ItemFrame(index));
}
} else
Invalidate();