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

fix font_size issue that would cause crash

Browse Source
This commit is contained in:
Jinhao 2017-04-27 03:39:50 +08:00
parent 2ff8a1c729
commit 54537f35f5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/gui/widgets/skeletons/text_token_stream.hpp
View File

@ -859,7 +859,7 @@ namespace nana{ namespace widgets{ namespace skeletons
//Create a default fblock. //Create a default fblock.
fblock * fbp = new fblock; fblock * fbp = new fblock;
fbp->font_size = 0xFFFFFFFF; fbp->font_size = -1;
fbp->bold = false; fbp->bold = false;
fbp->bold_empty = true; fbp->bold_empty = true;
fbp->text_align = fblock::aligns::baseline; fbp->text_align = fblock::aligns::baseline;

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

@ -238,7 +238,7 @@ namespace nana
double _m_font_size(nana::widgets::skeletons::fblock* fp) noexcept double _m_font_size(nana::widgets::skeletons::fblock* fp) noexcept
{ {
while(fp->font_size == -1) while(fp->font_size < 0)
{ {
fp = fp->parent; fp = fp->parent;
if(nullptr == fp) if(nullptr == fp)
@ -623,7 +623,7 @@ namespace nana
std::unique_ptr<measurer> msr_ptr{ nullptr }; std::unique_ptr<measurer> msr_ptr{ nullptr };
align text_align{align::left}; align text_align{align::left};
align_v text_align_v; align_v text_align_v{align_v::top};
class renderer renderer; class renderer renderer;