Merge branch 'besh81-develop' into develop

This commit is contained in:
Jinhao 2019-07-16 03:38:35 +08:00
commit 9b07dc0d67

View File

@ -126,6 +126,12 @@ namespace nana
{ {
close_fn_ = std::move(fn); close_fn_ = std::move(fn);
} }
bool hit_close() const
{
return x_pointed_;
}
private: private:
virtual void attached(widget_reference wdg, graph_reference graph) override virtual void attached(widget_reference wdg, graph_reference graph) override
{ {
@ -310,7 +316,9 @@ namespace nana
{ {
move_pos += moves_.start_container_pos; move_pos += moves_.start_container_pos;
API::move_window(container_->handle(), move_pos); API::move_window(container_->handle(), move_pos);
notifier_->notify_move();
if(!caption_.get_drawer_trigger().hit_close())
notifier_->notify_move();
} }
} }
} }