...

1 files changed, 19 insertions, 0 deletions

diff --git a/CruUI/ui/window.cpp b/CruUI/ui/window.cpp
index 8430d09b..fe37fc46 100644
--- a/CruUI/ui/window.cpp
+++ b/CruUI/ui/window.cpp
@@ -337,6 +337,13 @@ namespace cru
                 OnResizeInternal(LOWORD(l_param), HIWORD(l_param));
                 result = 0;
                 return true;
+            case WM_ACTIVATE:
+                if (w_param == WA_ACTIVE || w_param == WA_CLICKACTIVE)
+                    OnActivatedInternal();
+                else if (w_param == WA_INACTIVE)
+                    OnDeactivatedInternal();
+                result = 0;
+                return true;
             case WM_DESTROY:
                 OnDestroyInternal();
                 result = 0;
@@ -577,6 +584,18 @@ namespace cru
             DispatchEvent(control, &Control::OnMouseUpCore, nullptr, dip_point, button);
         }
 
+        void Window::OnActivatedInternal()
+        {
+            events::UiEventArgs args(this, this);
+            activated_event.Raise(args);
+        }
+
+        void Window::OnDeactivatedInternal()
+        {
+            events::UiEventArgs args(this, this);
+            deactivated_event.Raise(args);
+        }
+
         void Window::DispatchMouseHoverControlChangeEvent(Control* old_control, Control* new_control, const Point& point)
         {
             if (new_control != old_control) //if the mouse-hover-on control changed