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

Merge remote-tracking branch 'jinhao/hotfix-1.6.1' into hotfix-1.6.1

Browse Source
This commit is contained in:
qPCR4vir 2018-08-28 10:40:40 +02:00
commit e0b9e19c1c
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,6 +351,22 @@ namespace nana
*/ */
unsigned _m_prepare_visual_lines(graph_reference graph, dstream::linecontainer& line, unsigned def_line_px, render_status& rs) unsigned _m_prepare_visual_lines(graph_reference graph, dstream::linecontainer& line, unsigned def_line_px, render_status& rs)
{ {
if (line.empty())
{
//Insert an empty visual line for empty content.
#ifdef _nana_std_has_emplace_return_type
auto & vsline = rs.vslines.emplace_back();
#else
rs.vslines.emplace_back();
auto & vsline = rs.vslines.back();
vsline.baseline = 0;
vsline.extent_height_px = def_line_px;
vsline.x_base = 0;
#endif
return 0;
}
unsigned abs_text_px = 0; unsigned abs_text_px = 0;
unsigned max_ascent = 0; unsigned max_ascent = 0;
unsigned max_descent = 0; unsigned max_descent = 0;