From 2093b0173de533d93b6a3948816d10a54e59ad7a 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: cbbd3b12bd39eb5864d36b4e65170537dd3ca556 [formerly 80427bae4f2fef2233e41b85deaeba918e255093] [formerly 214fdf978a17f2d0aaa322f5d2258dbc8e7e2165 [formerly 141936940313f2f7ab16ab40e9ef0b02d3774b35]] Former-commit-id: 16629755c17ea100d6baacf9ebf8ebf34d8010a6 [formerly 26d4be9f6128fa9eb1546f7b57cada10b7c2a0f1] Former-commit-id: 019fbb16bcc12f9bd9644eb14aa8a4743618746e --- 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: