Merge branch 'develop' of https://github.com/beru/nana into beru-develop
Conflicts: source/gui/widgets/skeletons/text_editor.cpp source/gui/widgets/textbox.cpp source/paint/detail/image_bmp.hpp source/paint/detail/image_ico.hpp
This commit is contained in:
@@ -628,6 +628,8 @@ namespace nana
|
||||
nana::string target; //It indicates which target is tracing.
|
||||
nana::string url;
|
||||
|
||||
widget * buddy {nullptr};
|
||||
|
||||
void add_listener(std::function<void(command, const nana::string&)>&& fn)
|
||||
{
|
||||
listener_.emplace_back(std::move(fn));
|
||||
@@ -740,6 +742,10 @@ namespace nana
|
||||
impl_->call_listener(command::click, impl_->target);
|
||||
|
||||
system::open_url(url);
|
||||
|
||||
if (impl_->buddy) {
|
||||
impl_->buddy->focus();
|
||||
}
|
||||
}
|
||||
|
||||
void trigger::refresh(graph_reference graph)
|
||||
@@ -821,6 +827,11 @@ namespace nana
|
||||
return *this;
|
||||
}
|
||||
|
||||
void label::relate(widget& w)
|
||||
{
|
||||
get_drawer_trigger().impl()->buddy = &w;
|
||||
}
|
||||
|
||||
nana::size label::measure(unsigned limited) const
|
||||
{
|
||||
if(empty())
|
||||
|
||||
Reference in New Issue
Block a user