reflexion 0.1.24 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b21f636473fd5ec680195625f775ee0e324c0a8b75da8b54495fa65fc4831240
-  data.tar.gz: f5fdb73a7042b0c8fbacecd3da1b12cd568540fb4bbff732bdec166870c9f3b5
+  metadata.gz: 52288a5e598995e6c18b383655f5d20b4a0262237746b88ed5408cf3e5554025
+  data.tar.gz: ddd6f6977200341f3afd26f17d49c744ae1e47b76c33df93bd92f2d9283dcf41
 SHA512:
-  metadata.gz: c84fe590235e2d6accdac0c1201f9eb3cc456ebc68f7826a50cd562f942e021d875e24e396431af19d62066badc0f365b256541cbccff8f99bfa30b8d5e382ff
-  data.tar.gz: aa65600b586920743817256a1ab0c34c5a1428c5c7785759521e2ab602ffed17c95ec6e816a488d48e0181d5516743c382cc56e85fe95a26dd7fa209cd04cde7
+  metadata.gz: f7935b26729230d5827e0b40fa3750fb522422727fb600aa5433b9ae08576d63af57bdb590f858d9e5d2215e2efe7b22a455bdb49ff9078339f0781b9c124630
+  data.tar.gz: 3ca780dfc92485cccef7583aaaf40a337a215f3567b2e09cbe2a2917bd5f70663917e946f365c2eed214bbda492f7fc6c1d17735a712efdddff2600d03b023b9

data/Rakefile

@@ -28,4 +28,4 @@ test_ruby_extension
 generate_documents
 build_ruby_gem
 
-task :default => :test
+task :default => :ext

data/VERSION

@@ -1 +1 @@
-0.1.24
+0.1.27

data/include/reflex/window.h

@@ -35,7 +35,7 @@ namespace Reflex
 
 			virtual void hide ();
 
-			virtual void close ();
+			virtual void close (bool force = false);
 
 			virtual void redraw ();
 

data/lib/reflex/pointer_event.rb

@@ -14,7 +14,7 @@ module Reflex
 
     def_delegators :first,
       :id,
-      :type, :mouse?, :touch?, :pen?,
+      :types, :mouse?, :touch?, :pen?,
       :mouse_left?, :left?, :mouse_right?, :right?, :mouse_middle?, :middle?,
       :action, :down?, :up?, :move?, :cancel?, :stay?,
       :position, :pos, :x, :y, :modifiers, :click_count, :drag?,
@@ -25,7 +25,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::PointerEvent id:#{id} #{type} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
+      "#<Reflex::PointerEvent id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
     end
 
     private

data/reflex.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.6.0'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1.24'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.24'
-  s.add_runtime_dependency 'beeps', '~> 0.1.24'
-  s.add_runtime_dependency 'rays',  '~> 0.1.24'
+  s.add_runtime_dependency 'xot',   '~> 0.1.27'
+  s.add_runtime_dependency 'rucy',  '~> 0.1.27'
+  s.add_runtime_dependency 'beeps', '~> 0.1.27'
+  s.add_runtime_dependency 'rays',  '~> 0.1.27'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/ios/app_delegate.h

@@ -1,12 +1,6 @@
 // -*- objc -*-
 #import <UIKit/UIApplication.h>
-#include "application.h"
 
 
 @interface ReflexAppDelegate : UIResponder <UIApplicationDelegate>
-
-	- (void) bind: (Reflex::Application*) application;
-
-	- (BOOL) callOnStart;
-
 @end// ReflexAppDelegate

data/src/ios/app_delegate.mm

@@ -6,6 +6,7 @@
 #import  <CoreMotion/CoreMotion.h>
 #include "reflex/event.h"
 #include "reflex/exception.h"
+#include "application.h"
 
 
 @implementation ReflexAppDelegate

data/src/ios/application.mm

@@ -13,6 +13,12 @@ extern "C" {
 }
 
 
+@interface ReflexAppDelegate (Bind)
+	- (void) bind: (Reflex::Application*) application;
+	- (BOOL) callOnStart;
+@end
+
+
 namespace Reflex
 {
 

data/src/ios/view_controller.mm

@@ -16,7 +16,7 @@
 static ReflexViewController*
 create_reflex_view_controller ()
 {
-	return [[ReflexViewController alloc] init];
+	return [[[ReflexViewController alloc] init] autorelease];
 }
 
 static UIViewController*
@@ -102,7 +102,7 @@ ReflexViewController_get_show_fun ()
 
 @interface ReflexView ()
 
-	@property(nonatomic, strong) ReflexViewController* reflexViewController;
+	@property(nonatomic, unsafe_unretained) ReflexViewController* reflexViewController;
 
 @end
 
@@ -112,7 +112,9 @@ ReflexViewController_get_show_fun ()
 	- (void) layoutSubviews
 	{
 		[super layoutSubviews];
-		[self.reflexViewController viewDidResize];
+
+		if (self.reflexViewController)
+			[self.reflexViewController viewDidResize];
 	}
 
 @end
@@ -153,6 +155,9 @@ ReflexViewController_get_show_fun ()
 
 	- (void) dealloc
 	{
+		Reflex::Window* win = self.window;
+		if (win) win->close(true);
+
 		[self cleanup];
 		[super dealloc];
 	}
@@ -227,6 +232,11 @@ ReflexViewController_get_show_fun ()
 		[self setupReflexView];
 	}
 
+	- (ReflexView*) createReflexView
+	{
+		return [[[ReflexView alloc] initWithFrame: self.view.bounds] autorelease];
+	}
+
 	- (void) setupReflexView
 	{
 		ReflexView* view = [self createReflexView];
@@ -256,11 +266,6 @@ ReflexViewController_get_show_fun ()
 		self.reflexView = view;
 	}
 
-	- (ReflexView*) createReflexView
-	{
-		return [[[ReflexView alloc] initWithFrame: self.view.bounds] autorelease];
-	}
-
 	- (void) cleanupReflexView
 	{
 		ReflexView* view = self.reflexView;
@@ -270,6 +275,7 @@ ReflexViewController_get_show_fun ()
 		if (context && context == [EAGLContext currentContext])
 			[EAGLContext setCurrentContext: (EAGLContext*) Rays::get_offscreen_context()];
 
+		view.reflexViewController = nil;
 		[view removeFromSuperview];
 
 		self.reflexView = nil;

data/src/ios/window.mm

@@ -51,8 +51,7 @@ namespace Reflex
 	void
 	Window_initialize (Window* window)
 	{
-		ReflexViewController* vc =
-			[ReflexViewController_get_create_fun()() autorelease];
+		ReflexViewController* vc = ReflexViewController_get_create_fun()();
 		if (!vc)
 			reflex_error(__FILE__, __LINE__);
 
@@ -95,7 +94,6 @@ namespace Reflex
 	void
 	Window_close (Window* window)
 	{
-		not_implemented_error(__FILE__, __LINE__);
 	}
 
 	void
@@ -104,7 +102,7 @@ namespace Reflex
 		if (!title)
 			argument_error(__FILE__, __LINE__);
 
-		get_vc(window).title = [[NSString alloc] initWithUTF8String: title];
+		get_vc(window).title = [NSString stringWithUTF8String: title];
 	}
 
 	const char*

data/src/osx/native_window.mm

@@ -34,6 +34,20 @@ count_mouse_buttons (const Reflex::PointerEvent& e)
 	return nbuttons;
 }
 
+static void
+update_pixel_density (Reflex::Window* window)
+{
+	assert(window);
+
+	Rays::Painter* painter = window->painter();
+	if (!painter) return;
+
+	float pd = Window_get_pixel_density(*window);
+	if (painter->pixel_density() != pd)
+		painter->canvas(window->frame().dup().move_to(0, 0), pd);
+}
+
+
 @implementation NativeWindow
 
 	{
@@ -43,7 +57,7 @@ count_mouse_buttons (const Reflex::PointerEvent& e)
 		int update_count;
 		int clicking_count;
 		Reflex::Pointer::ID pointer_id;
-		Reflex::Pointer prevPointer;
+		Reflex::Pointer prev_pointer;
 	}
 
 	- (id) init
@@ -196,6 +210,8 @@ count_mouse_buttons (const Reflex::PointerEvent& e)
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
+		update_pixel_density(win);
+
 		if (update_count == 0)
 			[self update];
 
@@ -381,9 +397,11 @@ count_mouse_buttons (const Reflex::PointerEvent& e)
 		assert(e->size() == 1);
 
 		Reflex::Pointer& pointer = Reflex::PointerEvent_pointer_at(e, 0);
-		if (prevPointer)
-			Reflex::Pointer_set_prev(&pointer, &prevPointer);
-		prevPointer = pointer;
+		if (prev_pointer)
+			Reflex::Pointer_set_prev(&pointer, &prev_pointer);
+
+		prev_pointer = pointer;
+		Reflex::Pointer_set_prev(&prev_pointer, NULL);
 	}
 
 	- (void) scrollWheel: (NSEvent*) event

data/src/window.cpp

@@ -165,6 +165,15 @@ namespace Reflex
 		if (!event)
 			argument_error(__FILE__, __LINE__);
 
+		window->on_key(event);
+
+		switch (event->action())
+		{
+			case KeyEvent::DOWN: window->on_key_down(event); break;
+			case KeyEvent::UP:   window->on_key_up(event);   break;
+			default: break;
+		}
+
 		for (auto& [view, targets] : window->self->captures)
 		{
 			if (!is_capturing(view.get(), targets, View::CAPTURE_KEY))
@@ -179,17 +188,6 @@ namespace Reflex
 			View_call_key_event(window->self->focus.get(), event);
 
 		cleanup_captures(window);
-
-		if (event->is_blocked()) return;
-
-		window->on_key(event);
-
-		switch (event->action())
-		{
-			case KeyEvent::DOWN: window->on_key_down(event); break;
-			case KeyEvent::UP:   window->on_key_up(event);   break;
-			default: break;
-		}
 	}
 
 	static void
@@ -362,19 +360,6 @@ namespace Reflex
 		if (!event)
 			argument_error(__FILE__, __LINE__);
 
-		call_captured_pointer_events(window, event);
-
-		if (!event->empty())
-		{
-			PointerEvent_update_for_child_view(event, window->root());
-			View_call_pointer_event(window->root(), event);
-		}
-
-		cleanup_captures(window);
-
-		if (event->empty() || event->is_blocked())
-			return;
-
 		window->on_pointer(event);
 
 		switch ((*event)[0].action())
@@ -385,6 +370,16 @@ namespace Reflex
 			case Pointer::CANCEL: window->on_pointer_cancel(event); break;
 			default: break;
 		}
+
+		call_captured_pointer_events(window, event);
+
+		if (!event->empty())
+		{
+			PointerEvent_update_for_child_view(event, window->root());
+			View_call_pointer_event(window->root(), event);
+		}
+
+		cleanup_captures(window);
 	}
 
 	void
@@ -415,9 +410,7 @@ namespace Reflex
 
 	Window::~Window ()
 	{
-		//close();
-
-		View_set_window(self->root.get(), NULL);
+		//close(true);
 	}
 
 	void
@@ -453,11 +446,14 @@ namespace Reflex
 	}
 
 	void
-	Window::close ()
+	Window::close (bool force)
 	{
 		Event e;
 		on_close(&e);
-		if (e.is_blocked()) return;
+		if (!force && e.is_blocked()) return;
+
+		View_set_window(self->root.get(), NULL);
+		self->root.reset();
 
 		Window_close(this);
 	}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.27
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-04 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.24
+        version: 0.1.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.24
+        version: 0.1.27
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.24
+        version: 0.1.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.24
+        version: 0.1.27
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.24
+        version: 0.1.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.24
+        version: 0.1.27
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.24
+        version: 0.1.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.24
+        version: 0.1.27
 description: This library helps you to develop interactive graphical user interface.
 email: xordog@gmail.com
 executables: []
@@ -395,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A Graphical User Interface Tool Kit.