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

Merge branch 'besh81-hotfix-1.7.2' into hotfix-1.7.2

Browse Source
This commit is contained in:
Jinhao 2019-09-11 00:48:21 +08:00
commit eba4f2eb03
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/gui/place_parts.hpp
View File

@ -146,7 +146,8 @@ namespace nana
//draw caption //draw caption
auto text = to_wstring(API::window_caption(window_handle_)); auto text = to_wstring(API::window_caption(window_handle_));
text_rd_->render({ 3, 1 }, text.data(), text.size(), graph.size().width - 20, paint::text_renderer::mode::truncate_with_ellipsis); if((graph.size().width > 20) && (graph.size().width - 20 > 10))
text_rd_->render({ 3, 1 }, text.data(), text.size(), graph.size().width - 20, paint::text_renderer::mode::truncate_with_ellipsis);
//draw x button //draw x button
auto r = _m_button_area(); auto r = _m_button_area();

2
source/gui/widgets/toolbar.cpp
View File

@ -104,6 +104,7 @@ namespace nana
delete ptr; delete ptr;
cont_.clear(); cont_.clear();
right_ = npos;
} }
@ -683,6 +684,7 @@ namespace nana
if(m && (m->textout != show)) if(m && (m->textout != show))
{ {
m->textout = show; m->textout = show;
m->pixels = 0; //force width calculation
API::refresh_window(this->handle()); API::refresh_window(this->handle());
} }
} }