reflexion 0.1.42 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7ec97efd9d68e5053ddc3bf852f718a66ff883a5bb8693f605dcf45e962732
-  data.tar.gz: f2fd1319de6f1032802ce96c6657e9ac7dc0327a10c9ef9b1ba2f910c117c57a
+  metadata.gz: c10c73adab35ef74f8426582c0343a84873fbe71b116fd669e656b42edfee613
+  data.tar.gz: ffcf1e0fb5a0b26d3bd0dbc3a5e1627bc25ae7addbbd5dd213332f21b661e5d6
 SHA512:
-  metadata.gz: 61d0f5a9fc7ec41480642825f071d103d211035a38bcfda25eb90789fb642cf2663dce3f18771cc3702482e0a78d0385c4601ab23b4654f677f946af6000b425
-  data.tar.gz: abd4d92237cd9d49795ce5010b38565d7f3a4abd0b73ae4b18ca1989e748e911144ac3b11bdc6869400599c8eac6f120f751f75484c821a483b7475aefcec78a
+  metadata.gz: 7761664e1ba50fa8b10ef92c14dbeac9bfca2e4820bbe67d7f01cd44f6b7b235d06657796d567d9d3ff55bdf7e33eb911ab7dd2ea9f83dc77488c3f12771bada
+  data.tar.gz: 50ec935dcb2f5b692cab1ae3549aea533a8a2b7b4c4f89944ee92b39ca849feb7ac8f799dcf82cd8a4f066bdd2986d21489c56761f3e38acbda079e930fe677d

data/.doc/ext/reflex/window.cpp

@@ -194,6 +194,20 @@ VALUE get_painter(VALUE self)
 	return value(THIS->painter());
 }
 
+static
+VALUE on_activate(VALUE self, VALUE event)
+{
+	CHECK;
+	CALL(on_activate(to<Reflex::Event*>(event)));
+}
+
+static
+VALUE on_deactivate(VALUE self, VALUE event)
+{
+	CHECK;
+	CALL(on_deactivate(to<Reflex::Event*>(event)));
+}
+
 static
 VALUE on_show(VALUE self, VALUE event)
 {
@@ -341,6 +355,8 @@ Init_reflex_window ()
 	rb_define_method(cWindow, "root", RUBY_METHOD_FUNC(get_root), 0);
 	rb_define_method(cWindow, "focus", RUBY_METHOD_FUNC(get_focus), 0);
 	rb_define_method(cWindow, "painter", RUBY_METHOD_FUNC(get_painter), 0);
+	rb_define_method(cWindow, "on_activate", RUBY_METHOD_FUNC(on_activate), 1);
+	rb_define_method(cWindow, "on_deactivate", RUBY_METHOD_FUNC(on_deactivate), 1);
 	rb_define_method(cWindow, "on_show", RUBY_METHOD_FUNC(on_show), 1);
 	rb_define_method(cWindow, "on_hide", RUBY_METHOD_FUNC(on_hide), 1);
 	rb_define_method(cWindow, "on_close", RUBY_METHOD_FUNC(on_close), 1);

data/ChangeLog.md

@@ -1,6 +1,11 @@
 # reflex ChangeLog
 
 
+## [v0.1.43] - 2023-06-07
+
+- Add on_activate() and on_deactivate() to Window class
+
+
 ## [v0.1.42] - 2023-06-02
 
 - Implement the Screen class for iOS

data/VERSION

@@ -1 +1 @@
-0.1.42
+0.1.43

data/ext/reflex/window.cpp

@@ -216,6 +216,22 @@ RUCY_DEF0(get_painter)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_activate, event)
+{
+	CHECK;
+	CALL(on_activate(to<Reflex::Event*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_deactivate, event)
+{
+	CHECK;
+	CALL(on_deactivate(to<Reflex::Event*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_show, event)
 {
@@ -379,6 +395,8 @@ Init_reflex_window ()
 	cWindow.define_method("root",    get_root);
 	cWindow.define_method("focus",   get_focus);
 	cWindow.define_method("painter", get_painter);
+	cWindow.define_method("on_activate",   on_activate);
+	cWindow.define_method("on_deactivate", on_deactivate);
 	cWindow.define_method("on_show",  on_show);
 	cWindow.define_method("on_hide",  on_hide);
 	cWindow.define_method("on_close", on_close);

data/include/reflex/ruby/window.h

@@ -29,6 +29,24 @@ namespace Reflex
 
 		public:
 
+			virtual void on_activate (Event* e)
+			{
+				RUCY_SYM(on_activate);
+				if (this->is_overridable())
+					this->value.call(on_activate, Rucy::value(e));
+				else
+					return Super::on_activate(e);
+			}
+
+			virtual void on_deactivate (Event* e)
+			{
+				RUCY_SYM(on_deactivate);
+				if (this->is_overridable())
+					this->value.call(on_deactivate, Rucy::value(e));
+				else
+					return Super::on_deactivate(e);
+			}
+
 			virtual void on_show (Event* e)
 			{
 				RUCY_SYM(on_show);

data/include/reflex/window.h

@@ -89,6 +89,10 @@ namespace Reflex
 
 			virtual const Painter* painter () const;
 
+			virtual void on_activate   (Event* e);
+
+			virtual void on_deactivate (Event* e);
+
 			virtual void on_show (Event* e);
 
 			virtual void on_hide (Event* e);

data/reflex.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'xot',   '~> 0.1.38'
   s.add_runtime_dependency 'rucy',  '~> 0.1.38'
   s.add_runtime_dependency 'beeps', '~> 0.1.39'
-  s.add_runtime_dependency 'rays',  '~> 0.1.39'
+  s.add_runtime_dependency 'rays',  '~> 0.1.40'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/src/ios/view_controller.mm

@@ -285,14 +285,48 @@ ReflexViewController_get_show_fun ()
 	{
 		[super viewDidAppear: animated];
 		[self startTimer];
+
+		Window_call_activate_event(self.window);
+
+		[NSNotificationCenter.defaultCenter
+			addObserver: self
+			selector: @selector(didBecomeActive)
+			name: UIApplicationDidBecomeActiveNotification
+			object: nil];
+		[NSNotificationCenter.defaultCenter
+			addObserver: self
+			selector: @selector(willResignActive)
+			name: UIApplicationWillResignActiveNotification
+			object: nil];
 	}
 
 	- (void) viewDidDisappear: (BOOL) animated
 	{
+		[NSNotificationCenter.defaultCenter
+			removeObserver: self
+			name: UIApplicationDidBecomeActiveNotification
+			object: nil];
+		[NSNotificationCenter.defaultCenter
+			removeObserver: self
+			name: UIApplicationWillResignActiveNotification
+			object: nil];
+
+		Window_ca__deactivate_event(self.window);
+
 		[self stopTimer];
 		[super viewDidDisappear: animated];
 	}
 
+	- (void) didBecomeActive
+	{
+		Window_call_activate_event(self.window);
+	}
+
+	- (void) willResignActive
+	{
+		Window_call_deactivate_event(self.window);
+	}
+
 	- (void)viewDidLayoutSubviews
 	{
 		[super viewDidLayoutSubviews];

data/src/osx/native_window.mm

@@ -242,6 +242,9 @@ update_pixel_density (Reflex::Window* window)
 
 	- (void) windowWillClose: (NSNotification*) notification
 	{
+		if (self.isKeyWindow)
+			Window_call_deactivate_event(self.window);
+
 		[self stopTimer];
 		[self unbind];
 		[self setDelegate: nil];
@@ -306,6 +309,16 @@ update_pixel_density (Reflex::Window* window)
 		}
 	}
 
+	- (void) windowDidBecomeKey: (NSNotification*) notification
+	{
+		Window_call_activate_event(self.window);
+	}
+
+	- (void) windowDidResignKey: (NSNotification*) notification
+	{
+		Window_call_deactivate_event(self.window);
+	}
+
 	- (void) keyDown: (NSEvent*) event
 	{
 		Reflex::Window* win = self.window;

data/src/window.cpp

@@ -134,6 +134,24 @@ namespace Reflex
 		}
 	}
 
+	void
+	Window_call_activate_event (Reflex::Window* window)
+	{
+		if (!window) return;
+
+		Reflex::Event e;
+		window->on_activate(&e);
+	}
+
+	void
+	Window_call_deactivate_event (Reflex::Window* window)
+	{
+		if (!window) return;
+
+		Reflex::Event e;
+		window->on_deactivate(&e);
+	}
+
 	void
 	Window_call_draw_event (Window* window, DrawEvent* event)
 	{
@@ -598,6 +616,16 @@ namespace Reflex
 		return const_cast<Window*>(this)->painter();
 	}
 
+	void
+	Window::on_activate (Event* e)
+	{
+	}
+
+	void
+	Window::on_deactivate (Event* e)
+	{
+	}
+
 	void
 	Window::on_show (Event* e)
 	{

data/src/window.h

@@ -105,13 +105,17 @@ namespace Reflex
 	void Window_unregister_capture (
 		Window* window, View* view, Pointer::ID target);
 
-	void Window_call_draw_event    (Window* window, DrawEvent*    event);
+	void Window_call_activate_event   (Window* window);
 
-	void Window_call_key_event     (Window* window, KeyEvent*     event);
+	void Window_call_deactivate_event (Window* window);
 
-	void Window_call_pointer_event (Window* window, PointerEvent* event);
+	void Window_call_draw_event       (Window* window, DrawEvent*    event);
 
-	void Window_call_wheel_event   (Window* window, WheelEvent*   event);
+	void Window_call_key_event        (Window* window, KeyEvent*     event);
+
+	void Window_call_pointer_event    (Window* window, PointerEvent* event);
+
+	void Window_call_wheel_event      (Window* window, WheelEvent*   event);
 
 	float Window_get_pixel_density (const Window& window);
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.42
+  version: 0.1.43
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement