From 449bcfc4626dc47c2f807ae40493ad80eb1282fd Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 28 Aug 2016 18:02:07 +0200 Subject: [PATCH] Utility/EventHandler: Add OnEvent signal Former-commit-id: c4f6d185d78db4d9fa0e0ca76cf7b42768cd2ed3 [formerly 62df0f1948485951d72c42a51b511ecc5b283278] [formerly 444726d074e7e939db81547bf2f3dbcdc9eb25f6 [formerly 38d61f87a4280a20ac94286481dd418d5d931989]] Former-commit-id: 5a075b3e46f01486271fe5157b7176e768d8f939 [formerly bde57734c06d9d0b8220b65348cf8a67f971e228] Former-commit-id: 5e0857da1061965a4f8d9cf1c181ed25bf511320 --- include/Nazara/Utility/EventHandler.hpp | 3 ++- include/Nazara/Utility/EventHandler.inl | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Utility/EventHandler.hpp b/include/Nazara/Utility/EventHandler.hpp index b35ef96cf..2464d5e72 100644 --- a/include/Nazara/Utility/EventHandler.hpp +++ b/include/Nazara/Utility/EventHandler.hpp @@ -18,12 +18,13 @@ namespace Nz { public: EventHandler() = default; - EventHandler(const EventHandler&); + explicit EventHandler(const EventHandler&); EventHandler(EventHandler&&) = default; ~EventHandler() = default; inline void Dispatch(const WindowEvent& event); + NazaraSignal(OnEvent, const EventHandler* /*eventHandler*/, const WindowEvent& /*event*/); NazaraSignal(OnGainedFocus, const EventHandler* /*eventHandler*/); NazaraSignal(OnLostFocus, const EventHandler* /*eventHandler*/); NazaraSignal(OnKeyPressed, const EventHandler* /*eventHandler*/, const WindowEvent::KeyEvent& /*event*/); diff --git a/include/Nazara/Utility/EventHandler.inl b/include/Nazara/Utility/EventHandler.inl index 4fadf6b43..c066b6810 100644 --- a/include/Nazara/Utility/EventHandler.inl +++ b/include/Nazara/Utility/EventHandler.inl @@ -14,6 +14,8 @@ namespace Nz inline void EventHandler::Dispatch(const WindowEvent& event) { + OnEvent(this, event); + switch (event.type) { case WindowEventType_GainedFocus: