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

Merge remote-tracking branch 'upstream/hotfix-1.6.2' into hotfix-1.6.2

Browse Source
This commit is contained in:
James Bremner 2018-12-18 17:09:16 -05:00
commit 4a101c333a
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/gui/widgets/label.cpp
View File

@ -130,7 +130,7 @@ namespace nana
if (!_m_foreach_visual_line(graph, rs)) if (!_m_foreach_visual_line(graph, rs))
break; break;
rs.pos.y += static_cast<int>(rs.vslines.back().extent_height_px); //Now the y-position of rs has been modified to next line.
} }
if (transient_.current_font != pre_font) if (transient_.current_font != pre_font)
@ -531,10 +531,6 @@ namespace nana
bool _m_foreach_visual_line(graph_reference graph, render_status& rs) bool _m_foreach_visual_line(graph_reference graph, render_status& rs)
{ {
std::wstring text;
content_element_iterator block_start;
auto const bottom = static_cast<int>(graph.height()) - 1; auto const bottom = static_cast<int>(graph.height()) - 1;
for (auto & vsline : rs.vslines) for (auto & vsline : rs.vslines)