fix compiler error

This commit is contained in:
Jinhao 2017-05-25 06:14:38 +08:00
parent e25b41396e
commit b3f1b259ab

View File

@ -3132,7 +3132,7 @@ namespace nana{ namespace widgets
} }
else if (coord.x + static_cast<int>(caret_size().width) >= origin.x + static_cast<int>(view_area.width)) else if (coord.x + static_cast<int>(caret_size().width) >= origin.x + static_cast<int>(view_area.width))
{ {
extra.x = (std::min)(textbase().getline(points_.caret.y).size(), points_.caret.x + extra_count_horz); extra.x = (std::min)(static_cast<unsigned>(textbase().getline(points_.caret.y).size()), points_.caret.x + extra_count_horz);
auto new_origin = _m_caret_to_coordinate(extra, false).x + static_cast<int>(caret_size().width) - static_cast<int>(view_area.width); auto new_origin = _m_caret_to_coordinate(extra, false).x + static_cast<int>(caret_size().width) - static_cast<int>(view_area.width);
moved_origin.x = new_origin - origin.x; moved_origin.x = new_origin - origin.x;
} }