reflexion 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 519781325342b4d3ce4f84636140f9869f7a071835b880979e59b138b28242be
-  data.tar.gz: f474f2abbb1f8957ae5ddfc20b5a9fdcf8f0f0dc7fa3904122b0fff29d561952
+  metadata.gz: f0787ee344f23edde4f87bfb7d5d129a30bbc8ce0723bcf4d0da918196bfbc9f
+  data.tar.gz: 6153596e926fce9e12d27a843871e12025d39722a27f8d473811426a69285464
 SHA512:
-  metadata.gz: 74fa4aeefb7e4639c3b05b3bf7ae257695690b63e01b30f97058d9f9d672704a9912937a85469eb3b9cb853de5f4505233f5857bca3e20cfb998368409df089a
-  data.tar.gz: 71fb5eed0de8a8619964399fcb6981ca7e8841b9e8bbc333ddbe94593f98c6ead527ad5196fa30f97d17d7a2d52cbbe29f4c8aa898f0e8930102239322987638
+  metadata.gz: 6f0f485cab308f5246c44ee0e12c55541ccc7c0247403b6e1bcc676946ab1a9be2260d7d28316a8c12c4630230168ee1b9c93b1a1f398b828b93ead6acc8e8e3
+  data.tar.gz: a39e8b85065a9eacb9bb36db287066f9e53ab5e40f47e9f05d67915dfdea4296120aa8a81953104926440448432642ae0ac763688d53ac0b47792e5cd3153e78

data/.doc/ext/reflex/pointer.cpp

@@ -20,7 +20,7 @@ VALUE alloc(VALUE klass)
 
 static
 VALUE initialize(VALUE self, VALUE
-	id, VALUE types, VALUE action, VALUE position, VALUE modifiers, VALUE drag, VALUE click_count, VALUE view_index, VALUE time)
+	id, VALUE types, VALUE action, VALUE position, VALUE modifiers, VALUE click_count, VALUE drag, VALUE time)
 {
 	CHECK;
 
@@ -30,9 +30,8 @@ VALUE initialize(VALUE self, VALUE
 		(Reflex::Pointer::Action) to<int>(action),
 		to<Rays::Point>(position),
 		to<uint>(modifiers),
-		to<bool>(drag),
 		to<uint>(click_count),
-		to<uint>(view_index),
+		to<bool>(drag),
 		to<double>(time));
 	return self;
 }
@@ -80,13 +79,6 @@ VALUE get_modifiers(VALUE self)
 	return value(THIS->modifiers());
 }
 
-static
-VALUE is_drag(VALUE self)
-{
-	CHECK;
-	return value(THIS->is_drag());
-}
-
 static
 VALUE get_click_count(VALUE self)
 {
@@ -95,10 +87,10 @@ VALUE get_click_count(VALUE self)
 }
 
 static
-VALUE get_view_index(VALUE self)
+VALUE is_drag(VALUE self)
 {
 	CHECK;
-	return value(THIS->view_index());
+	return value(THIS->is_drag());
 }
 
 static
@@ -132,16 +124,15 @@ Init_reflex_pointer ()
 
 	cPointer = rb_define_class_under(mReflex, "Pointer", rb_cObject);
 	rb_define_alloc_func(cPointer, alloc);
-	rb_define_private_method(cPointer, "initialize", RUBY_METHOD_FUNC(initialize), 9);
+	rb_define_private_method(cPointer, "initialize", RUBY_METHOD_FUNC(initialize), 8);
 	rb_define_private_method(cPointer, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cPointer, "id", RUBY_METHOD_FUNC(get_id), 0);
 	rb_define_private_method(cPointer, "get_types", RUBY_METHOD_FUNC(get_types), 0);
 	rb_define_private_method(cPointer, "get_action", RUBY_METHOD_FUNC(get_action), 0);
 	rb_define_method(cPointer, "position", RUBY_METHOD_FUNC(get_position), 0);
 	rb_define_method(cPointer, "modifiers", RUBY_METHOD_FUNC(get_modifiers), 0);
-	cPointer.define_method("drag?",              is_drag);
 	rb_define_method(cPointer, "click_count", RUBY_METHOD_FUNC(get_click_count), 0);
-	rb_define_method(cPointer, "view_index", RUBY_METHOD_FUNC(get_view_index), 0);
+	cPointer.define_method("drag?",              is_drag);
 	rb_define_method(cPointer, "time", RUBY_METHOD_FUNC(get_time), 0);
 	rb_define_method(cPointer, "prev", RUBY_METHOD_FUNC(get_prev), 0);
 	rb_define_method(cPointer, "down", RUBY_METHOD_FUNC(get_down), 0);

data/.doc/ext/reflex/style_length.cpp

@@ -71,7 +71,9 @@ scan_type_and_value (
 {
 	assert(type && value);
 
-	if (!str || *str == '\0')
+	if (!str)
+		argument_error(__FILE__, __LINE__);
+	if (*str == '\0')
 		argument_error(__FILE__, __LINE__);
 
 	char buf[101];

data/.doc/ext/reflex/view.cpp

@@ -272,7 +272,7 @@ to_shape (Value value)
 	if (value.is_nil())
 		return NULL;
 
-	if (value.is_kind_of(Rays::polygon_class()))
+	if (value.is_a(Rays::polygon_class()))
 	{
 		Reflex::PolygonShape* shape = new Reflex::PolygonShape();
 		shape->set_polygon(to<Rays::Polygon&>(value));
@@ -409,7 +409,7 @@ VALUE set_pivot(VALUE self)
 {
 	CHECK;
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 	{
 		check_arg_count(__FILE__, __LINE__, "View#pivot=(Point)", argc, 1);
 
@@ -446,7 +446,7 @@ VALUE scroll_to(VALUE self)
 {
 	CHECK;
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 	{
 		check_arg_count(__FILE__, __LINE__, "View#scroll_to(Point)", argc, 1);
 
@@ -476,7 +476,7 @@ VALUE scroll_by(VALUE self)
 {
 	CHECK;
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 	{
 		check_arg_count(__FILE__, __LINE__, "View#scroll_by", argc, 1);
 
@@ -819,13 +819,20 @@ VALUE get_gravity_scale(VALUE self)
 }
 
 static
-VALUE update_physics(VALUE self)
+VALUE create_world(VALUE self, VALUE pixels_per_meter)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#update_physics", argc, 0, 1);
+	THIS->create_world(to<float>(pixels_per_meter));
+}
+
+static
+VALUE update_world(VALUE self)
+{
+	CHECK;
+	check_arg_count(__FILE__, __LINE__, "View#update_world", argc, 0, 1);
 
 	float duration = argc >= 1 ? to<float>(argv[0]) : 0;
-	THIS->update_physics(duration);
+	THIS->update_world(duration);
 	return self;
 }
 
@@ -1182,7 +1189,8 @@ Init_reflex_view ()
 	rb_define_method(cView, "gravity_scale=", RUBY_METHOD_FUNC(set_gravity_scale), 1);
 	rb_define_method(cView, "gravity_scale", RUBY_METHOD_FUNC(get_gravity_scale), 0);
 
-	rb_define_method(cView, "update_physics", RUBY_METHOD_FUNC(update_physics), -1);
+	rb_define_method(cView, "create_world", RUBY_METHOD_FUNC(create_world), 1);
+	rb_define_method(cView, "update_world", RUBY_METHOD_FUNC(update_world), -1);
 	rb_define_method(cView, "meter2pixel", RUBY_METHOD_FUNC(meter2pixel), -1);
 	rb_define_method(cView, "gravity=", RUBY_METHOD_FUNC(set_gravity), -1);
 	rb_define_method(cView, "gravity", RUBY_METHOD_FUNC(get_gravity), 0);

data/ChangeLog.md

@@ -1,6 +1,18 @@
 # reflex ChangeLog
 
 
+## [v0.3.1] - 2025-01-13
+
+- Add View#create_world(pixels_per_meter)
+- Rename View#update_physics to View#update_world
+- Delete Pointer#view_index
+- Update LICENSE
+
+- Fix crash in unregister_captures() called immediately after deleting a view
+- Fix that incorrect determination whether the pointer is in a view or not
+- Fix a bug that caused some pointer events to be ignored in zoomed views
+
+
 ## [v0.3] - 2024-07-06
 
 - Support Windows

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
-  arm64-darwin-22
+  arm64-darwin-23
 
 DEPENDENCIES
   rake

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 xord.org
+Copyright (c) 2011 xord.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -1,6 +1,5 @@
 # -*- mode: ruby -*-
 
-
 %w[../xot ../rucy ../rays .]
   .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/VERSION

@@ -1 +1 @@
-0.3
+0.3.1

data/ext/reflex/pointer.cpp

@@ -20,8 +20,8 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF9(initialize,
-	id, types, action, position, modifiers, drag, click_count, view_index, time)
+RUCY_DEF8(initialize,
+	id, types, action, position, modifiers, click_count, drag, time)
 {
 	CHECK;
 
@@ -31,9 +31,8 @@ RUCY_DEF9(initialize,
 		(Reflex::Pointer::Action) to<int>(action),
 		to<Rays::Point>(position),
 		to<uint>(modifiers),
-		to<bool>(drag),
 		to<uint>(click_count),
-		to<uint>(view_index),
+		to<bool>(drag),
 		to<double>(time));
 	return self;
 }
@@ -88,14 +87,6 @@ RUCY_DEF0(get_modifiers)
 }
 RUCY_END
 
-static
-RUCY_DEF0(is_drag)
-{
-	CHECK;
-	return value(THIS->is_drag());
-}
-RUCY_END
-
 static
 RUCY_DEF0(get_click_count)
 {
@@ -105,10 +96,10 @@ RUCY_DEF0(get_click_count)
 RUCY_END
 
 static
-RUCY_DEF0(get_view_index)
+RUCY_DEF0(is_drag)
 {
 	CHECK;
-	return value(THIS->view_index());
+	return value(THIS->is_drag());
 }
 RUCY_END
 
@@ -153,9 +144,8 @@ Init_reflex_pointer ()
 	cPointer.define_private_method("get_action", get_action);
 	cPointer.define_method("position",           get_position);
 	cPointer.define_method("modifiers",          get_modifiers);
-	cPointer.define_method("drag?",              is_drag);
 	cPointer.define_method("click_count",        get_click_count);
-	cPointer.define_method("view_index",         get_view_index);
+	cPointer.define_method("drag?",              is_drag);
 	cPointer.define_method("time",               get_time);
 	cPointer.define_method("prev",               get_prev);
 	cPointer.define_method("down",               get_down);

data/ext/reflex/style_length.cpp

@@ -72,7 +72,9 @@ scan_type_and_value (
 {
 	assert(type && value);
 
-	if (!str || *str == '\0')
+	if (!str)
+		argument_error(__FILE__, __LINE__);
+	if (*str == '\0')
 		argument_error(__FILE__, __LINE__);
 
 	char buf[101];

data/ext/reflex/view.cpp

@@ -298,7 +298,7 @@ to_shape (Value value)
 	if (value.is_nil())
 		return NULL;
 
-	if (value.is_kind_of(Rays::polygon_class()))
+	if (value.is_a(Rays::polygon_class()))
 	{
 		Reflex::PolygonShape* shape = new Reflex::PolygonShape();
 		shape->set_polygon(to<Rays::Polygon&>(value));
@@ -450,7 +450,7 @@ RUCY_DEFN(set_pivot)
 {
 	CHECK;
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 	{
 		check_arg_count(__FILE__, __LINE__, "View#pivot=(Point)", argc, 1);
 
@@ -489,7 +489,7 @@ RUCY_DEFN(scroll_to)
 {
 	CHECK;
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 	{
 		check_arg_count(__FILE__, __LINE__, "View#scroll_to(Point)", argc, 1);
 
@@ -520,7 +520,7 @@ RUCY_DEFN(scroll_by)
 {
 	CHECK;
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 	{
 		check_arg_count(__FILE__, __LINE__, "View#scroll_by", argc, 1);
 
@@ -903,13 +903,21 @@ RUCY_DEF0(get_gravity_scale)
 RUCY_END
 
 static
-RUCY_DEFN(update_physics)
+RUCY_DEF1(create_world, pixels_per_meter)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#update_physics", argc, 0, 1);
+	THIS->create_world(to<float>(pixels_per_meter));
+}
+RUCY_END
+
+static
+RUCY_DEFN(update_world)
+{
+	CHECK;
+	check_arg_count(__FILE__, __LINE__, "View#update_world", argc, 0, 1);
 
 	float duration = argc >= 1 ? to<float>(argv[0]) : 0;
-	THIS->update_physics(duration);
+	THIS->update_world(duration);
 	return self;
 }
 RUCY_END
@@ -1302,7 +1310,8 @@ Init_reflex_view ()
 	cView.define_method("gravity_scale=", set_gravity_scale);
 	cView.define_method("gravity_scale",  get_gravity_scale);
 
-	cView.define_method("update_physics", update_physics);
+	cView.define_method("create_world", create_world);
+	cView.define_method("update_world", update_world);
 	cView.define_method("meter2pixel", meter2pixel);
 	cView.define_method("gravity=", set_gravity);
 	cView.define_method("gravity",  get_gravity);

data/include/reflex/pointer.h

@@ -65,8 +65,8 @@ namespace Reflex
 
 			Pointer (
 				ID id, uint types, Action action,
-				const Point& position, uint modifiers, bool drag,
-				uint click_count, uint view_index, double time);
+				const Point& position, uint modifiers, uint click_count, bool drag,
+				double time);
 
 			Pointer (const This& obj);
 
@@ -84,11 +84,9 @@ namespace Reflex
 
 			uint modifiers () const;
 
-			bool is_drag () const;
-
 			uint click_count () const;
 
-			uint view_index () const;
+			bool is_drag () const;
 
 			double time () const;
 

data/include/reflex/ruby/timer.h

@@ -30,7 +30,7 @@ namespace Reflex
 
 			virtual void fire ()
 			{
-				if (this->value.is_kind_of(timer_class()))
+				if (this->value.is_a(timer_class()))
 				{
 					RUCY_SYM(call_timer_block);
 					this->value.call(call_timer_block);

data/include/reflex/view.h

@@ -309,7 +309,9 @@ namespace Reflex
 			//
 			// for physics child world
 			//
-			virtual void update_physics (float duration = 0);
+			virtual void create_world (float pixels_per_meter);
+
+			virtual void update_world (float duration = 0);
 
 			virtual float meter2pixel (float meter = 1, bool create_world = true);
 

data/lib/reflex/pointer.rb

@@ -95,7 +95,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::Pointer id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} drag:#{drag?} click:#{click_count} view:#{view_index} time:#{time.round 2}>"
+      "#<Reflex::Pointer id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
     end
 
   end# Pointer

data/lib/reflex/pointer_event.rb

@@ -16,7 +16,7 @@ module Reflex
       :types, :mouse?, :touch?, :pen?,
       :mouse_left?, :left?, :mouse_right?, :right?, :mouse_middle?, :middle?,
       :action, :down?, :up?, :move?, :cancel?, :stay?,
-      :position, :pos, :x, :y, :modifiers, :drag?, :click_count, :view_index,
+      :position, :pos, :x, :y, :modifiers, :click_count, :drag?,
       :time, :prev, :down
 
     def pointers()
@@ -24,7 +24,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::PointerEvent id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} drag:#{drag?} click:#{click_count} view:#{view_index} 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
 
   end# PointerEvent

data/reflex.gemspec

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

data/src/body.cpp

@@ -284,24 +284,30 @@ namespace Reflex
 	void
 	Body_copy_attributes (Body* to, const Body& from)
 	{
-		if (!to)
-			return;
-
-		if (to->self->ppm != from.self->ppm)
-			physics_error(__FILE__, __LINE__);
+		if (!to) return;
 
 		      b2Body* b2to   = Body_get_b2ptr(to);
 		const b2Body* b2from = Body_get_b2ptr(&from);
 		assert(b2to && b2from);
 
 		b2to->SetType(           b2from->GetType());
-		b2to->SetTransform(      b2from->GetPosition(), b2from->GetAngle());
 		b2to->SetLinearVelocity( b2from->GetLinearVelocity());
 		b2to->SetAngularVelocity(b2from->GetAngularVelocity());
 		b2to->SetLinearDamping(  b2from->GetLinearDamping());
 		b2to->SetAngularDamping( b2from->GetAngularDamping());
 		b2to->SetGravityScale(   b2from->GetGravityScale());
 		b2to->SetBullet(         b2from->IsBullet());
+
+		float ppm_to   = to->self->ppm;
+		float ppm_from = from.self->ppm;
+		if (ppm_to == ppm_from)
+			b2to->SetTransform(b2from->GetPosition(), b2from->GetAngle());
+		else
+		{
+			auto pos = b2from->GetPosition();
+			pos *= ppm_from / ppm_to;
+			b2to->SetTransform(pos, b2from->GetAngle());
+		}
 	}
 
 	Body*

data/src/event.cpp

@@ -592,28 +592,16 @@ namespace Reflex
 		{
 		}
 
-		void increment_view_indices ()
-		{
-			for (auto& pointer : pointers)
-				Pointer_set_view_index(&pointer, pointer.view_index() + 1);
-
-			if (parent) parent->increment_view_indices();
-		}
-
 	};// PointerEvent::Data
 
 
 	void
-	PointerEvent_add_pointer (
-		PointerEvent* pthis, const Pointer& pointer,
-		std::function<void(Pointer*)> fun)
+	PointerEvent_add_pointer (PointerEvent* pthis, const Pointer& pointer)
 	{
 		if (!pthis)
 			argument_error(__FILE__, __LINE__);
 
 		pthis->self->pointers.emplace_back(pointer);
-
-		if (fun) fun(&pthis->self->pointers.back());
 	}
 
 	void
@@ -659,15 +647,6 @@ namespace Reflex
 			fun(pointer);
 	}
 
-	void
-	PointerEvent_increment_view_indices (PointerEvent* pthis)
-	{
-		if (!pthis)
-			argument_error(__FILE__, __LINE__);
-
-		pthis->self->increment_view_indices();
-	}
-
 	void
 	PointerEvent_set_captured (PointerEvent* pthis, bool captured)
 	{
@@ -680,23 +659,24 @@ namespace Reflex
 	void
 	PointerEvent_update_for_child_view (PointerEvent* pthis, const View* child)
 	{
-		if (!pthis || !child)
+		if (!pthis)
+			argument_error(__FILE__, __LINE__);
+		if (!child)
 			argument_error(__FILE__, __LINE__);
 
 		const Bounds& frame = child->frame();
-		Bounds bounds       = frame.dup().move_to(0, 0);
 
 		std::vector<Pointer> pointers;
 		for (const auto& pointer : pthis->self->pointers)
 		{
+			if (!frame.is_include(pointer.position()))
+				continue;
+
 			pointers.emplace_back(pointer);
 			Pointer_update_positions(&pointers.back(), [&](Point* pos)
 			{
 				*pos = child->from_parent(*pos);
 			});
-
-			if (!bounds.is_include(pointers.back().position()))
-				pointers.pop_back();
 		}
 		pthis->self->pointers = pointers;
 	}
@@ -704,7 +684,9 @@ namespace Reflex
 	void
 	PointerEvent_update_for_capturing_view (PointerEvent* pthis, const View* view)
 	{
-		if (!pthis || !view)
+		if (!pthis)
+			argument_error(__FILE__, __LINE__);
+		if (!view)
 			argument_error(__FILE__, __LINE__);
 
 		for (auto& pointer : pthis->self->pointers)

data/src/event.h

@@ -24,9 +24,7 @@ namespace Reflex
 	void KeyEvent_set_captured (KeyEvent* pthis, bool captured);
 
 
-	void PointerEvent_add_pointer (
-		PointerEvent* pthis, const Pointer& pointer,
-		std::function<void(Pointer*)> fun = NULL);
+	void PointerEvent_add_pointer (PointerEvent* pthis, const Pointer& pointer);
 
 	void PointerEvent_erase_pointer (PointerEvent* pthis, Pointer::ID id);
 

data/src/filter.cpp

@@ -36,7 +36,9 @@ namespace Reflex
 		if (!self->shader)
 			return;
 
-		if (!painter || !image)
+		if (!painter)
+			argument_error(__FILE__, __LINE__);
+		if (!image)
 			argument_error(__FILE__, __LINE__);
 
 		painter->set_shader(self->shader);

data/src/ios/event.mm

@@ -82,9 +82,8 @@ namespace Reflex
 				action,
 				to_point([touch locationInView: view]),
 				get_modifiers(event),
-				action == Pointer::MOVE,
 				(uint) touch.tapCount,
-				0,
+				action == Pointer::MOVE,
 				touch.timestamp);
 
 			if (pointer.action() != Pointer::DOWN)

data/src/osx/application.mm

@@ -4,6 +4,7 @@
 
 #import <AppKit/NSApplication.h>
 #include "reflex/exception.h"
+#include "reflex/debug.h"
 #import "app_delegate.h"
 
 
@@ -42,11 +43,11 @@ namespace Reflex
 	static ReflexAppDelegate*
 	setup_app_delegate (NSApplication* app)
 	{
-		id<NSApplicationDelegate> delegate = [app delegate];
+		id<NSApplicationDelegate> delegate = app.delegate;
 		if (!delegate)
 		{
-			delegate = [[[ReflexAppDelegate alloc] init] autorelease];
-			[app setDelegate: delegate];
+			delegate     = [[[ReflexAppDelegate alloc] init] autorelease];
+			app.delegate = delegate;
 		}
 
 		if (![delegate isKindOfClass: ReflexAppDelegate.class])
@@ -58,11 +59,11 @@ namespace Reflex
 	void
 	Application::start ()
 	{
-		NSApplication* app          = [NSApplication sharedApplication];
+		NSApplication* app          = NSApplication.sharedApplication;
 		ReflexAppDelegate* delegate = setup_app_delegate(app);
 		[delegate bind: this];
 
-		if (![app isRunning])
+		if (!app.isRunning)
 			[app run];
 		else
 			[delegate callOnStart];

data/src/osx/event.mm

@@ -148,9 +148,8 @@ namespace Reflex
 			action,
 			get_pointer_position(event, view),
 			get_modifiers(event),
-			dragging,
 			action == Pointer::MOVE && !dragging ? 0 : (uint) event.clickCount,
-			0,
+			dragging,
 			time()));
 	}