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

merge beru's changes

Browse Source
This commit is contained in:
Jinhao
2015-08-02 03:33:43 +08:00
parent 66c1e1ad98
commit e0ee42d184
18 changed files with 59 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/gui/widgets/label.cpp
View File

@@ -628,7 +628,7 @@ namespace nana
nana::string target; //It indicates which target is tracing.
nana::string url;
widget * buddy {nullptr};
window for_associated_wd{ nullptr };
void add_listener(std::function<void(command, const nana::string&)>&& fn)
{
@@ -743,9 +743,7 @@ namespace nana
system::open_url(url);
if (impl_->buddy) {
impl_->buddy->focus();
}
API::focus_window(impl_->for_associated_wd);
}
void trigger::refresh(graph_reference graph)
@@ -827,9 +825,9 @@ namespace nana
return *this;
}
void label::relate(widget& w)
void label::click_for(window associated_window)
{
get_drawer_trigger().impl()->buddy = &w;
get_drawer_trigger().impl()->for_associated_wd = associated_window;
}
nana::size label::measure(unsigned limited) const