mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-23 22:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash clicking on a non-ListItem widget inside a multiselect ListBox

Browse Source
This commit is contained in:
David Capello 2016-12-02 18:41:09 -03:00
parent efce7d56a8
commit 42b8d04e46
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ui/listbox.cpp
View File

@ -229,7 +229,7 @@ bool ListBox::onProcessMessage(Message* msg)
}
if (pick_item) {
Widget* picked;
Widget* picked = nullptr;
if (view) {
picked = view->viewport()->pick(mousePos);
@ -239,11 +239,8 @@ bool ListBox::onProcessMessage(Message* msg)
}
// If the picked widget is a child of the list, select it
if (picked && hasChild(picked)) {
if (ListItem* pickedItem = dynamic_cast<ListItem*>(picked)) {
selectChild(pickedItem, msg);
}
}
if (picked && hasChild(picked))
selectChild(picked, msg);
}
return true;
@ -365,7 +362,7 @@ void ListBox::onSizeHint(SizeHintEvent& ev)
int w = 0, h = 0;
UI_FOREACH_WIDGET_WITH_END(children(), it, end) {
Size reqSize = static_cast<ListItem*>(*it)->sizeHint();
Size reqSize = (*it)->sizeHint();
w = MAX(w, reqSize.w);
h += reqSize.h + (it+1 != end ? this->childSpacing(): 0);