From a94a806f69586e08a30fff0cdb3e52b0ce7acfa5 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 5 Apr 2019 00:11:36 +0800 Subject: Refactor event. --- src/ui/window.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/ui/window.cpp') diff --git a/src/ui/window.cpp b/src/ui/window.cpp index 23bda285..f909e0f9 100644 --- a/src/ui/window.cpp +++ b/src/ui/window.cpp @@ -105,25 +105,25 @@ Window::Window(tag_overlapped_constructor) { platform::UiApplication::GetInstance()->CreateWindow(nullptr); render_object_.reset(new render::WindowRenderObject(this)); - event_revokers_.push_back(native_window_->DestroyEvent()->AddHandler( + event_revoker_guard_.Add(native_window_->DestroyEvent()->AddHandler( std::bind(&Window::OnNativeDestroy, this))); - event_revokers_.push_back(native_window_->PaintEvent()->AddHandler( + event_revoker_guard_.Add(native_window_->PaintEvent()->AddHandler( std::bind(&Window::OnNativePaint, this))); - event_revokers_.push_back(native_window_->ResizeEvent()->AddHandler( + event_revoker_guard_.Add(native_window_->ResizeEvent()->AddHandler( std::bind(&Window::OnNativeResize, this, _1))); - event_revokers_.push_back(native_window_->FocusEvent()->AddHandler( + event_revoker_guard_.Add(native_window_->FocusEvent()->AddHandler( std::bind(&Window::OnNativeFocus, this, _1))); - event_revokers_.push_back(native_window_->MouseEnterLeaveEvent()->AddHandler( + event_revoker_guard_.Add(native_window_->MouseEnterLeaveEvent()->AddHandler( std::bind(&Window::OnNativeMouseEnterLeave, this, _1))); - event_revokers_.push_back(native_window_->MouseMoveEvent()->AddHandler( + event_revoker_guard_.Add(native_window_->MouseMoveEvent()->AddHandler( std::bind(&Window::OnNativeMouseMove, this, _1))); - event_revokers_.push_back(native_window_->MouseDownEvent()->AddHandler( + event_revoker_guard_.Add(native_window_->MouseDownEvent()->AddHandler( std::bind(&Window::OnNativeMouseDown, this, _1, _2))); - event_revokers_.push_back(native_window_->MouseUpEvent()->AddHandler( + event_revoker_guard_.Add(native_window_->MouseUpEvent()->AddHandler( std::bind(&Window::OnNativeMouseUp, this, _1, _2))); - event_revokers_.push_back(native_window_->KeyDownEvent()->AddHandler( + event_revoker_guard_.Add(native_window_->KeyDownEvent()->AddHandler( std::bind(&Window::OnNativeKeyDown, this, _1))); - event_revokers_.push_back(native_window_->KeyUpEvent()->AddHandler( + event_revoker_guard_.Add(native_window_->KeyUpEvent()->AddHandler( std::bind(&Window::OnNativeKeyUp, this, _1))); } -- cgit v1.2.3