mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix-1.5.5' into feature-listbox

Browse Source
This commit is contained in:
Jinhao
2017-11-22 03:54:49 +08:00
parent bbc2dc2aea 14cc7cdaa1
commit dddd704786
29 changed files with 529 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/gui/widgets/listbox.cpp
View File

@@ -4006,6 +4006,11 @@ namespace nana
essence_->content_view.reset(new widgets::skeletons::content_view{ widget.handle() });
essence_->resize_disp_area();
//Set the content_view wheel speed with the listbox scheme.
essence_->content_view->set_wheel_speed([this] {
return essence_->scheme_ptr->mouse_wheel.lines;
});
essence_->content_view->events().hover_outside = [this](const point& cur_pos) {
essence_->update_mouse_selection(cur_pos);
};
@@ -4239,16 +4244,17 @@ namespace nana
{
if (item_ptr->flags.selected != sel)
{
item_ptr->flags.selected = sel;
lister.emit_cs(abs_item_pos, true);
if (item_ptr->flags.selected)
if (sel)
{
//Deselects the previously selected item.
lister.cancel_others_if_single_enabled(true, abs_item_pos);
essence_->lister.latest_selected_abs = abs_item_pos;
}
else if (essence_->lister.latest_selected_abs == abs_item_pos)
essence_->lister.latest_selected_abs.set_both(npos);
item_ptr->flags.selected = sel;
lister.emit_cs(abs_item_pos, true);
}
}
else