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

fix button and progress issues(#325,#327)

Browse Source
This commit is contained in:
Jinhao 2018-07-17 00:57:05 +08:00
parent 8e546695d7
commit fe6965c4d8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/gui/widgets/button.cpp
View File

@ -150,11 +150,12 @@ namespace nana{ namespace drawerbase
if (false == cite_.draw(graph, attr_.bgcolor, attr_.fgcolor, ::nana::rectangle{ graph.size() }, e_state)) if (false == cite_.draw(graph, attr_.bgcolor, attr_.fgcolor, ::nana::rectangle{ graph.size() }, e_state))
{ {
if (!API::is_transparent_background(*wdg_)) if (API::is_transparent_background(*wdg_))
{ API::dev::copy_transparent_background(*wdg_, graph);
else
_m_draw_background(graph); _m_draw_background(graph);
_m_draw_border(graph);
} _m_draw_border(graph);
} }
_m_draw_title(graph, eb); _m_draw_title(graph, eb);
} }

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

@ -49,7 +49,7 @@ namespace nana
if (value_ptr) if (value_ptr)
{ {
if (unknown_) if (unknown_)
value_ += (*value_ptr ? 5 : 0); value_ += 5;
else else
value_ = (std::min)(max_, *value_ptr); value_ = (std::min)(max_, *value_ptr);
@ -99,7 +99,7 @@ namespace nana
auto value_px = (widget_->size().width - border_px * 2); auto value_px = (widget_->size().width - border_px * 2);
//avoid overflow //avoid overflow
if (value_ < max_) if (unknown_ || (value_ < max_))
value_px = static_cast<unsigned>(value_px * (double(value_) / double(max_))); value_px = static_cast<unsigned>(value_px * (double(value_) / double(max_)));
if (value_px != value_px_) if (value_px != value_px_)