reflexion 0.1.15 → 0.1.21

data/src/event.cpp

@@ -28,12 +28,6 @@ namespace Reflex
 	}
 
 
-	MotionEvent::MotionEvent (const Point& gravity)
-	:	gravity(gravity)
-	{
-	}
-
-
 	UpdateEvent::UpdateEvent (double now, float dt)
 	:	now(now), dt(dt)
 	{
@@ -170,7 +164,7 @@ namespace Reflex
 		if (positions_)
 		{
 			for (size_t i = 0; i < size; ++i)
-				positions[i] = *(Rays::Coord3*) &positions_[i];
+				positions[i] = *(Coord3*) &positions_[i];
 		}
 	}
 
@@ -302,4 +296,10 @@ namespace Reflex
 	}
 
 
+	MotionEvent::MotionEvent (const Point& gravity)
+	:	gravity(gravity)
+	{
+	}
+
+
 }// Reflex

data/src/ios/view_controller.mm

@@ -371,7 +371,7 @@ ReflexViewController_get_show_fun ()
 				b.move_to(0, 0);
 
 				if (win->painter())
-					win->painter()->canvas(b, UIScreen.mainScreen.scale);
+					win->painter()->canvas(b, win->painter()->pixel_density());
 
 				if (win->root())
 					View_set_frame(win->root(), b);

data/src/ios/window.mm

@@ -130,6 +130,24 @@ namespace Reflex
 			rect.size.height);
 	}
 
+	void
+	Window_set_resizable (Window* window, bool state)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	bool
+	Window_is_resizable (const Window& window)
+	{
+		return false;
+	}
+
+	float
+	Window_get_pixel_density (const Window& window)
+	{
+		return UIScreen.mainScreen.scale;
+	}
+
 
 	WindowData::WindowData ()
 	{

data/src/osx/native_window.mm

@@ -250,7 +250,7 @@ static const NSUInteger WINDOW_STYLE_MASK =
 				b.move_to(0, 0);
 
 				if (win->painter())
-					win->painter()->canvas(b, self.backingScaleFactor);
+					win->painter()->canvas(b, win->painter()->pixel_density());
 
 				if (win->root())
 					View_set_frame(win->root(), b);

data/src/osx/window.mm

@@ -112,6 +112,28 @@ namespace Reflex
 			rect.size.height);
 	}
 
+	void
+	Window_set_resizable (Window* window, bool state)
+	{
+		NativeWindow* native = get_native(window);
+		if (state)
+			native.styleMask |= NSResizableWindowMask;
+		else
+			native.styleMask &= ~NSResizableWindowMask;
+	}
+
+	bool
+	Window_is_resizable (const Window& window)
+	{
+		return get_native(&window).styleMask & NSResizableWindowMask;
+	}
+
+	float
+	Window_get_pixel_density (const Window& window)
+	{
+		return get_native(&window).backingScaleFactor;
+	}
+
 
 	WindowData::WindowData ()
 	{

data/src/timer.cpp

@@ -162,8 +162,7 @@ namespace Reflex
 	{
 		assert(timer && *timer);
 
-		List::iterator end = timers.end();
-		for (List::iterator it = timers.begin(); it != end; ++it)
+		for (auto it = timers.begin(), end = timers.end(); it != end; ++it)
 		{
 			if (timer->self->next_time < (*it)->self->next_time)
 			{
@@ -219,8 +218,7 @@ namespace Reflex
 		if (!timer)
 			argument_error(__FILE__, __LINE__);
 
-		List::iterator end = timers.end();
-		for (List::iterator it = timers.begin(); it != end; ++it)
+		for (auto it = timers.begin(), end = timers.end(); it != end; ++it)
 		{
 			if (timer->id() == (*it)->id())
 				timers.erase(it);
@@ -261,8 +259,7 @@ namespace Reflex
 	void
 	Timers::fire (double now)
 	{
-		List::iterator end = timers.end();
-		for (List::iterator it = timers.begin(); it != end; ++it)
+		for (auto it = timers.begin(), end = timers.end(); it != end; ++it)
 		{
 			Timer* timer = it->get();
 			if (!is_time_to_fire(timer, now))

data/src/window.cpp

@@ -133,7 +133,7 @@ namespace Reflex
 		self->root->set_name(VIEW_TAG_ROOT);
 		View_set_window(self->root.get(), this);
 
-		self->painter.canvas(0, 0, 1, 1);
+		self->painter.canvas(0, 0, 1, 1, Window_get_pixel_density(*this));
 	}
 
 	Window::~Window ()
@@ -221,6 +221,18 @@ namespace Reflex
 		return Window_get_frame(*this);
 	}
 
+	void
+	Window::set_resizable (bool state)
+	{
+		Window_set_resizable(this, state);
+	}
+
+	bool
+	Window::is_resizable () const
+	{
+		Window_is_resizable(*this);
+	}
+
 	bool
 	Window::hidden () const
 	{

data/src/window.h

@@ -78,10 +78,16 @@ namespace Reflex
 
 	Bounds Window_get_frame (const Window& window);
 
+	void Window_set_resizable (Window* window, bool state);
+
+	bool Window_is_resizable (const Window& window);
+
 	void Window_set_focus (Window* window, View* view);
 
 	void Window_call_draw_event (Window* window, DrawEvent* event);
 
+	float Window_get_pixel_density (const Window& window);
+
 
 	typedef View* (*Window_CreateRootViewFun) ();
 

data/test/test_pointer_event.rb

@@ -6,80 +6,125 @@ require_relative 'helper'
 
 class TestPointerEvent < Test::Unit::TestCase
 
+  E = Reflex::PointerEvent
   T = true
   F = false
 
-  def event (*args)
-    Reflex::PointerEvent.new *args
+  TYPE_NONE = E::TYPE_NONE
+  DOWN      = E::TYPE_DOWN
+  UP        = E::TYPE_UP
+  MOVE      = E::TYPE_MOVE
+
+  POINTER_NONE = E::POINTER_NONE
+  LEFT         = E::POINTER_MOUSE_LEFT
+  RIGHT        = E::POINTER_MOUSE_RIGHT
+  MIDDLE       = E::POINTER_MOUSE_MIDDLE
+  TOUCH        = E::POINTER_TOUCH
+  PEN          = E::POINTER_PEN
+
+  def event (
+    type = TYPE_NONE, pointer_type = POINTER_NONE,
+    modifiers = 0, count = 0, drag = false,
+    positions: [0])
+
+    Reflex::PointerEvent.new type, pointer_type, modifiers, count, drag, positions
   end
 
-  def type (arg)
-    event(arg).tap do |o|
-      def o.test ()
-        [type, down?, up?, move?]
-      end
-    end
+  def test_initialize ()
+    assert_nothing_raised       {event positions: 10.times.to_a}
+    assert_raise(ArgumentError) {event positions: 11.times.to_a}
+    assert_raise(ArgumentError) {event positions: []}
   end
 
   def test_type ()
-    o = type Reflex::PointerEvent::TYPE_NONE
+    def type (arg)
+      event(arg).tap do |o|
+        def o.test ()
+          [type, down?, up?, move?]
+        end
+      end
+    end
+
+    o = type TYPE_NONE
     assert_equal [:none, F, F, F], o.test
 
-    o = type Reflex::PointerEvent::TYPE_DOWN
+    o = type DOWN
     assert_equal [:down, T, F, F], o.test
 
-    o = type Reflex::PointerEvent::TYPE_UP
+    o = type UP
     assert_equal [:up,   F, T, F], o.test
 
-    o = type Reflex::PointerEvent::TYPE_MOVE
+    o = type MOVE
     assert_equal [:move, F, F, T], o.test
   end
 
-  def pointer_type (arg)
-    event(Reflex::PointerEvent::TYPE_NONE, arg).tap do |o|
-      def o.test ()
-        [pointer_type, left?, right?, middle?, touch?, pen?]
+  def test_pointer_type ()
+    def pointer_type (arg)
+      event(TYPE_NONE, arg).tap do |o|
+        def o.test ()
+          [pointer_type, left?, right?, middle?, touch?, pen?]
+        end
       end
     end
-  end
 
-  def test_pointer_type ()
-    o = pointer_type Reflex::PointerEvent::POINTER_NONE
+    o = pointer_type POINTER_NONE
     assert_equal [[],              F, F, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT
+    o = pointer_type LEFT
     assert_equal [[:mouse_left],   T, F, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_RIGHT
+    o = pointer_type RIGHT
     assert_equal [[:mouse_right],  F, T, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_MIDDLE
+    o = pointer_type MIDDLE
     assert_equal [[:mouse_middle], F, F, T, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_TOUCH
+    o = pointer_type TOUCH
     assert_equal [[:touch],        F, F, F, T, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_PEN
+    o = pointer_type PEN
     assert_equal [[:pen],          F, F, F, F, T], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT |
-      Reflex::PointerEvent::POINTER_MOUSE_RIGHT
+    o = pointer_type LEFT | RIGHT
     types = [:mouse_left, :mouse_right]
     assert_equal [types, T, T, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT |
-      Reflex::PointerEvent::POINTER_MOUSE_RIGHT |
-      Reflex::PointerEvent::POINTER_MOUSE_MIDDLE
+    o = pointer_type LEFT | RIGHT | MIDDLE
     types = [:mouse_left, :mouse_right, :mouse_middle]
     assert_equal [types, T, T, T, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT |
-      Reflex::PointerEvent::POINTER_MOUSE_RIGHT |
-      Reflex::PointerEvent::POINTER_MOUSE_MIDDLE |
-      Reflex::PointerEvent::POINTER_TOUCH |
-      Reflex::PointerEvent::POINTER_PEN
+    o = pointer_type LEFT | RIGHT | MIDDLE | TOUCH | PEN
     types = [:mouse_left, :mouse_right, :mouse_middle, :touch, :pen]
     assert_equal [types, T, T, T, T, T], o.test
   end
 
+  def test_size ()
+    assert_equal 1, event(positions: [0]   ).size
+    assert_equal 2, event(positions: [0, 1]).size
+  end
+
+  def test_xy ()
+    assert_equal 0, event(positions: [[0, 1], [2, 3]]).x
+    assert_equal 1, event(positions: [[0, 1], [2, 3]]).y
+  end
+
+  def test_position ()
+    assert_equal [0, 1], event(positions: [[0, 1], [2, 3]]).position.to_a
+  end
+
+  def test_positions ()
+    assert_equal [[0, 0]],         event(positions: [0]   ).positions.map(&:to_a)
+    assert_equal [[0, 0], [1, 1]], event(positions: [0, 1]).positions.map(&:to_a)
+
+    assert_equal [[0, 1]],         event(positions: [[0, 1]]        ).positions.map(&:to_a)
+    assert_equal [[0, 1], [2, 3]], event(positions: [[0, 1], [2, 3]]).positions.map(&:to_a)
+  end
+
+  def test_at ()
+    assert_equal [0, 1], event(positions: [[0, 1], [2, 3]])[0].to_a
+    assert_equal [2, 3], event(positions: [[0, 1], [2, 3]])[1].to_a
+    assert_raise(IndexError) {event(positions: [[0, 1], [2, 3]])[-1]}
+    assert_raise(IndexError) {event(positions: [[0, 1], [2, 3]])[2]}
+  end
+
 end# TestPointerEvent

data/test/test_window.rb

@@ -68,6 +68,23 @@ class TestWindow < Test::Unit::TestCase
     w.frame = [bounds(1, 2, 3, 4, 5, 6)]; assert_equal [1, 2, 0, 4, 5, 0], w.frame.to_a(3)
   end
 
+  def test_resizable? ()
+    w = win
+    assert_true  w.resizable?
+
+    w.resizable = false
+    assert_false w.resizable?
+
+    w.resizable = true
+    assert_true  w.resizable?
+
+    w.resizable false
+    assert_false w.resizable?
+
+    w.resizable true
+    assert_true  w.resizable?
+  end
+
   def test_title ()
     w = win
     assert_equal '', w.title

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.21
 platform: ruby
 authors:
 - xordog
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-12-16 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'
+        version: 0.1.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.21
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.21
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.21
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.21
 description: This library helps you to develop interactive graphical user interface.
 email: xordog@gmail.com
 executables: []
@@ -200,6 +200,7 @@ files:
 - lib/reflex/bitmap.rb
 - lib/reflex/bounds.rb
 - lib/reflex/button.rb
+- lib/reflex/camera.rb
 - lib/reflex/capture_event.rb
 - lib/reflex/color.rb
 - lib/reflex/color_space.rb
@@ -249,6 +250,7 @@ files:
 - reflex.gemspec
 - samples/app.rb
 - samples/bats.rb
+- samples/camera.rb
 - samples/checker.rb
 - samples/fans.rb
 - samples/fps.rb
@@ -359,7 +361,7 @@ files:
 homepage: https://github.com/xord/reflex
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -375,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Graphical User Interface Tool Kit.
 test_files: