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

Merge branch 'hotfix-1.4.1' into feature-listbox

Browse Source
This commit is contained in:
Jinhao 2016-11-28 08:05:00 +08:00
commit 2aec6d283c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2255,12 +2255,9 @@ namespace nana
/// @param with_rest: Means whether including extra one item that is not completely contained in reset pixels.
size_type number_of_lister_items(bool with_rest) const
{
unsigned lister_s = content_area().height - header_visible_px() - (scroll.h.empty() ? 0 : scroll.scale);
auto item_px = (std::max)(static_cast<decltype(scheme_ptr->item_height)>(1), scheme_ptr->item_height);
item_px = scheme_ptr->item_height;
return (lister_s / item_px) + (with_rest && (lister_s % item_px) ? 1 : 0);
unsigned exposed_px = content_area().height - header_visible_px() - (scroll.h.empty() ? 0 : scroll.scale);
auto const item_px = (std::max)(static_cast<decltype(scheme_ptr->item_height)>(1), scheme_ptr->item_height);
return (exposed_px / item_px) + (with_rest && (exposed_px % item_px) ? 1 : 0);
}
//keep the first selected item in the display area: the distances are in display positions!