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

small improvements

Browse Source
This commit is contained in:
Jinhao 2018-04-09 17:47:48 +08:00
parent 2ba32d8aca
commit 3de91cb9a2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/gui/widgets/scroll.hpp
View File

@ -502,7 +502,7 @@ namespace nana
bool make_page_scroll(bool forward) bool make_page_scroll(bool forward)
{ {
auto const count = range() / step(); auto const count = range() / step();
return this->make_step(forward, (count > 2 ? count - 1 : 1)); return this->make_step(forward, static_cast<unsigned>(count > 2 ? count - 1 : 1));
} }
};//end class scroll };//end class scroll
}//end namespace nana }//end namespace nana

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

@ -1934,10 +1934,10 @@ namespace nana
nana::listbox * widget_{nullptr}; nana::listbox * widget_{nullptr};
sort_attributes sort_attrs_; //Attributes of sort sort_attributes sort_attrs_; //Attributes of sort
container categories_;
bool ordered_categories_{false}; ///< A switch indicates whether the categories are ordered. bool ordered_categories_{false}; ///< A switch indicates whether the categories are ordered.
/// The ordered categories always creates a new category at a proper position(before the first one which is larger than it). /// The ordered categories always creates a new category at a proper position(before the first one which is larger than it).
container categories_;
bool single_selection_{ false }; bool single_selection_{ false };
bool single_selection_category_limited_{ false }; bool single_selection_category_limited_{ false };
@ -2049,7 +2049,7 @@ namespace nana
index_pair first_display() const noexcept index_pair first_display() const noexcept
{ {
auto offset_display = content_view->origin().y / item_height(); auto offset_display = content_view->origin().y / item_height();
return lister.advance(lister.first(), offset_display); return lister.advance(lister.first(), static_cast<int>(content_view->origin().y / item_height()));
} }
unsigned item_height() const noexcept unsigned item_height() const noexcept
@ -4569,7 +4569,7 @@ namespace nana
if (target_idx.empty()) if (target_idx.empty())
target_idx = list.first(); target_idx = list.first();
origin.y = list.distance(list.first(), target_idx) * item_px; origin.y = static_cast<int>(list.distance(list.first(), target_idx) * item_px);
} }
else else
{ {
@ -4577,7 +4577,7 @@ namespace nana
if (target_idx.empty()) if (target_idx.empty())
target_idx = list.last(); target_idx = list.last();
origin.y = list.distance(list.first(), target_idx) * item_px + item_px; origin.y = static_cast<int>((list.distance(list.first(), target_idx) + 1) * item_px);
if (origin.y >= static_cast<int>(screen_bottom - screen_top)) if (origin.y >= static_cast<int>(screen_bottom - screen_top))
origin.y -= static_cast<int>(screen_bottom - screen_top); origin.y -= static_cast<int>(screen_bottom - screen_top);
else else