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

Merge branch 'progressbar_with_stop' of https://github.com/qPCR4vir/nana into qPCR4vir-progressbar_with_stop

Browse Source
This commit is contained in:
Jinhao 2015-06-10 07:31:01 +08:00
commit 80f71e98e8
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/nana/gui/widgets/progress.hpp
View File

@ -30,6 +30,8 @@ namespace nana
unsigned Max(unsigned); unsigned Max(unsigned);
void unknown(bool); void unknown(bool);
bool unknown() const; bool unknown() const;
bool stop(bool s = true);
bool stoped() const;
private: private:
void attached(widget_reference, graph_reference) override; void attached(widget_reference, graph_reference) override;
void refresh(graph_reference) override; void refresh(graph_reference) override;
@ -45,6 +47,7 @@ namespace nana
nana::paint::graphics* graph_{nullptr}; nana::paint::graphics* graph_{nullptr};
unsigned draw_width_{static_cast<unsigned>(-1)}; unsigned draw_width_{static_cast<unsigned>(-1)};
bool unknown_{false}; bool unknown_{false};
bool stop_{false};
unsigned max_{100}; unsigned max_{100};
unsigned value_{0}; unsigned value_{0};
}; //end class drawer }; //end class drawer
@ -67,6 +70,8 @@ namespace nana
unsigned amount(unsigned value); unsigned amount(unsigned value);
void unknown(bool); void unknown(bool);
bool unknown() const; bool unknown() const;
bool stop(bool s=true); ///< request stop or cancel and return previus stop status
bool stoped() const;
}; };
}//end namespace nana }//end namespace nana
#endif #endif

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

@ -89,6 +89,15 @@ namespace nana
{ {
return unknown_; return unknown_;
} }
bool trigger::stoped() const
{
return stop_;
}
bool trigger::stop(bool s)
{
std::swap(s,stop_);
return s;
}
void trigger::refresh(graph_reference) void trigger::refresh(graph_reference)
{ {
@ -197,5 +206,13 @@ namespace nana
{ {
return get_drawer_trigger().unknown(); return get_drawer_trigger().unknown();
} }
bool progress::stop(bool s)
{
return get_drawer_trigger().stop(s);
}
bool progress::stoped() const
{
return get_drawer_trigger().stoped();
}
//end class progress //end class progress
}//end namespace nana }//end namespace nana