improve content_view

This commit is contained in:
Jinhao 2017-04-19 00:39:41 +08:00
parent 919008d448
commit 606087f962

View File

@ -96,7 +96,7 @@ namespace nana {
if (!arg.is_left_button()) if (!arg.is_left_button())
return; return;
if (this->drive(arg.pos)) if (this->drive(arg.pos, true))
{ {
tmr.interval(16); tmr.interval(16);
tmr.start(); tmr.start();
@ -116,7 +116,7 @@ namespace nana {
auto curs = ::nana::API::cursor_position(); auto curs = ::nana::API::cursor_position();
::nana::API::calc_window_point(window_handle, curs); ::nana::API::calc_window_point(window_handle, curs);
if (this->drive(curs)) if (this->drive(curs, false))
{ {
if (events.hover_outside) if (events.hover_outside)
events.hover_outside(curs); events.hover_outside(curs);
@ -129,10 +129,13 @@ namespace nana {
}); });
} }
bool drive(const point& cursor_pos) bool drive(const point& cursor_pos, bool check_cursor_pos)
{ {
auto const area = view.view_area(); auto const area = view.view_area();
if (check_cursor_pos && !area.is_hit(cursor_pos))
return false;
point skew; point skew;
if (disp_area.x > cursor_pos.x) if (disp_area.x > cursor_pos.x)