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

Merge branch 'hotfix-1.4.1' into develop

Browse Source
This commit is contained in:
Jinhao 2017-03-26 06:32:15 +08:00
commit afc556dff3
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/gui/widgets/skeletons/text_editor.cpp
View File

@ -1347,23 +1347,22 @@ namespace nana{ namespace widgets
impl_->capacities.behavior->pre_calc_lines(width_pixels()); impl_->capacities.behavior->pre_calc_lines(width_pixels());
if (points_.offset.x > 0)
{
auto maxline = textbase().max_line(); auto maxline = textbase().max_line();
nana::size text_size = _m_text_extent_size(textbase().getline(maxline.first).c_str(), maxline.second); nana::size text_size = _m_text_extent_size(textbase().getline(maxline.first).c_str(), maxline.second);
text_size.width += 1; text_size.width += 1;
if (static_cast<int>(text_size.width) - points_.offset.x < static_cast<int>(this->width_pixels()))
{
points_.offset.x = (std::max)(0, points_.offset.x = (std::max)(0,
static_cast<int>(text_size.width + 1) - static_cast<int>(this->width_pixels()) static_cast<int>(text_size.width) - static_cast<int>(this->width_pixels())
); );
} }
if (points_.offset.y > 0)
{
auto const lines = impl_->capacities.behavior->take_lines(); auto const lines = impl_->capacities.behavior->take_lines();
auto const scr_lines = this->screen_lines(); auto const scr_lines = this->screen_lines();
if (static_cast<int>(lines) - points_.offset.y < static_cast<int>(scr_lines))
{
_m_offset_y((std::max)(static_cast<int>(lines)-static_cast<int>(scr_lines), 0)); _m_offset_y((std::max)(static_cast<int>(lines)-static_cast<int>(scr_lines), 0));
} }