From 54537f35f510368b69828140c1812e414d63ed8c Mon Sep 17 00:00:00 2001 From: Jinhao Date: Thu, 27 Apr 2017 03:39:50 +0800 Subject: [PATCH] fix font_size issue that would cause crash --- include/nana/gui/widgets/skeletons/text_token_stream.hpp | 2 +- source/gui/widgets/label.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/nana/gui/widgets/skeletons/text_token_stream.hpp b/include/nana/gui/widgets/skeletons/text_token_stream.hpp index 3793cc50..ea61349e 100644 --- a/include/nana/gui/widgets/skeletons/text_token_stream.hpp +++ b/include/nana/gui/widgets/skeletons/text_token_stream.hpp @@ -859,7 +859,7 @@ namespace nana{ namespace widgets{ namespace skeletons //Create a default fblock. fblock * fbp = new fblock; - fbp->font_size = 0xFFFFFFFF; + fbp->font_size = -1; fbp->bold = false; fbp->bold_empty = true; fbp->text_align = fblock::aligns::baseline; diff --git a/source/gui/widgets/label.cpp b/source/gui/widgets/label.cpp index 281ecea7..a4a8cef1 100644 --- a/source/gui/widgets/label.cpp +++ b/source/gui/widgets/label.cpp @@ -238,7 +238,7 @@ namespace nana double _m_font_size(nana::widgets::skeletons::fblock* fp) noexcept { - while(fp->font_size == -1) + while(fp->font_size < 0) { fp = fp->parent; if(nullptr == fp) @@ -623,7 +623,7 @@ namespace nana std::unique_ptr msr_ptr{ nullptr }; align text_align{align::left}; - align_v text_align_v; + align_v text_align_v{align_v::top}; class renderer renderer;