reflexion 0.1.19 → 0.1.23

data/src/view.cpp

@@ -9,6 +9,7 @@
 #include "reflex/exception.h"
 #include "reflex/debug.h"
 #include "window.h"
+#include "event.h"
 #include "selector.h"
 #include "timer.h"
 #include "style.h"
@@ -877,7 +878,7 @@ namespace Reflex
 		result->clear();
 
 		Selector* sel = view->self->pselector.get();
-		if (!sel || sel->is_empty())
+		if (!sel || sel->empty())
 			return false;
 
 		get_styles_for_selector(result, view, *sel);
@@ -1211,7 +1212,7 @@ namespace Reflex
 
 		View::Data* self = view->self.get();
 
-		if (selector.is_empty())
+		if (selector.empty())
 			self->add_flag(View::Data::UPDATE_STYLE);
 		else
 			self->selectors_for_update().insert(selector);
@@ -1228,16 +1229,15 @@ namespace Reflex
 
 	template <typename FUN, typename EVENT>
 	static void
-	call_children (View* parent, FUN fun, const EVENT& e)
+	call_children (View* parent, const EVENT& event, FUN fun)
 	{
 		assert(parent);
 
-		View::ChildList* pchildren = parent->self->pchildren.get();
-		if (pchildren)
-		{
-			for (auto& pchild : *pchildren)
-				fun(pchild.get(), e);
-		}
+		auto* pchildren = parent->self->pchildren.get();
+		if (!pchildren) return;
+
+		for (auto& pchild : *pchildren)
+			fun(pchild.get(), event);
 	}
 
 	void
@@ -1246,9 +1246,6 @@ namespace Reflex
 		if (!view)
 			argument_error(__FILE__, __LINE__);
 
-		bool capturing = view->capture() & View::CAPTURE_KEY;
-		if (capturing != event.capture) return;
-
 		KeyEvent e = event;
 		view->on_key(&e);
 
@@ -1261,22 +1258,34 @@ namespace Reflex
 	}
 
 	static void
-	filter_pointer_event (
-		PointerEvent* to, const PointerEvent& from, const Bounds& frame)
+	update_captures (View* view, PointerEvent* event)
 	{
-		assert(to);
-
-		const Point& offset = frame.position();
+		Window* win = view->window();
+		if (!win)
+			invalid_state_error(__FILE__, __LINE__);
 
-		to->size = 0;
-		for (size_t i = 0; i < from.size; ++i) {
-			const Point& pos = from.position(i);
-			if (!frame.is_include(pos))
-				continue;
+		PointerEvent_each_pointer(event, [&](const auto& pointer)
+		{
+			auto action = pointer.action();
+			if (action == Pointer::DOWN)
+			{
+				Window_register_capture(win, view, pointer.id());
+			}
+			else if (action == Pointer::UP || action == Pointer::CANCEL)
+			{
+				Window_unregister_capture(win, view, pointer.id());
+			}
+		});
+	}
 
-			to->positions[i] = pos - offset;
-			++to->size;
-		}
+	static void
+	call_pointer_event_for_each_child (View* parent, const PointerEvent& event)
+	{
+		call_children(parent, event, [](View* child, const PointerEvent& e) {
+			PointerEvent e2 = e;
+			PointerEvent_update_for_child_view(&e2, child);
+			View_call_pointer_event(child, e2);
+		});
 	}
 
 	void
@@ -1285,29 +1294,25 @@ namespace Reflex
 		if (!view)
 			argument_error(__FILE__, __LINE__);
 
-		bool capturing = view->capture() & View::CAPTURE_POINTER;
-		if (capturing != event.capture) return;
-
-		const Bounds& frame = view->frame();
-
-		PointerEvent e = event;
-		filter_pointer_event(&e, event, frame);
-
-		if (!capturing && e.size == 0)
+		if (event.empty())
 			return;
 
+		PointerEvent e = event;
 		view->on_pointer(&e);
 
-		switch (e.type)
+		switch (e[0].action())
 		{
-			case PointerEvent::DOWN: view->on_pointer_down(&e); break;
-			case PointerEvent::UP:   view->on_pointer_up(&e);   break;
-			case PointerEvent::MOVE: view->on_pointer_move(&e); break;
-			case PointerEvent::NONE: break;
+			case Pointer::DOWN:   view->on_pointer_down(&e);   break;
+			case Pointer::UP:     view->on_pointer_up(&e);     break;
+			case Pointer::MOVE:   view->on_pointer_move(&e);   break;
+			case Pointer::CANCEL: view->on_pointer_cancel(&e); break;
+			default: break;
 		}
 
-		if (!event.capture)
-			call_children(view, View_call_pointer_event, e);
+		update_captures(view, &e);
+
+		if (!e.is_captured())
+			call_pointer_event_for_each_child(view, e);
 	}
 
 	void
@@ -1326,7 +1331,7 @@ namespace Reflex
 
 		view->on_wheel(&e);
 
-		call_children(view, View_call_wheel_event, e);
+		call_children(view, e, View_call_wheel_event);
 	}
 
 	void
@@ -1462,22 +1467,29 @@ namespace Reflex
 	Point
 	View::from_parent (const Point& point) const
 	{
-		not_implemented_error(__FILE__, __LINE__);
-		return 0;
+		if (!parent())
+			invalid_state_error(__FILE__, __LINE__);
+
+		return point - frame().position();
 	}
 
 	Point
 	View::to_parent (const Point& point) const
 	{
-		not_implemented_error(__FILE__, __LINE__);
-		return 0;
+		if (!parent())
+			invalid_state_error(__FILE__, __LINE__);
+
+		return point + frame().position();
 	}
 
 	Point
 	View::from_window (const Point& point) const
 	{
+		if (!window())
+			invalid_state_error(__FILE__, __LINE__);
+
 		Point p = point;
-		for (const View* v = parent(); v; v = v->parent())
+		for (const View* v = this; v; v = v->parent())
 			p -= v->frame().position();
 		return p;
 	}
@@ -1485,22 +1497,33 @@ namespace Reflex
 	Point
 	View::to_window (const Point& point) const
 	{
-		not_implemented_error(__FILE__, __LINE__);
-		return 0;
+		if (!window())
+			invalid_state_error(__FILE__, __LINE__);
+
+		Point p = point;
+		for (const View* v = this; v; v = v->parent())
+			p += v->frame().position();
+		return p;
 	}
 
 	Point
 	View::from_screen (const Point& point) const
 	{
-		not_implemented_error(__FILE__, __LINE__);
-		return 0;
+		const Window* w = window();
+		if (!w)
+			invalid_state_error(__FILE__, __LINE__);
+
+		return w->from_screen(from_window(point));
 	}
 
 	Point
 	View::to_screen (const Point& point) const
 	{
-		not_implemented_error(__FILE__, __LINE__);
-		return 0;
+		const Window* w = window();
+		if (!w)
+			invalid_state_error(__FILE__, __LINE__);
+
+		return w->to_screen(to_window(point));
 	}
 
 	static void
@@ -1682,7 +1705,7 @@ namespace Reflex
 	Style*
 	View::get_style (const Selector& selector, bool create)
 	{
-		if (selector.is_empty())
+		if (selector.empty())
 			return style(create);
 
 		StyleList* pstyles = self->pstyles.get();
@@ -1989,18 +2012,23 @@ namespace Reflex
 	void
 	View::scroll_to (coord x, coord y, coord z)
 	{
-		Point old = self->scroll();
-		self->scroll().reset(x, y, z);
-		ScrollEvent e(x, y, z, x - old.x, y - old.y, z - old.z);
-		on_scroll(&e);
-
-		redraw();
+		scroll_to(Point(x, y, z));
 	}
 
 	void
 	View::scroll_to (const Point& scroll)
 	{
-		scroll_to(scroll.x, scroll.y, scroll.z);
+		if (scroll == this->scroll()) return;
+
+		Point old = self->scroll();
+		self->scroll() = scroll;
+
+		ScrollEvent e(
+			scroll.x,         scroll.y,         scroll.z,
+			scroll.x - old.x, scroll.y - old.y, scroll.z - old.z);
+		on_scroll(&e);
+
+		redraw();
 	}
 
 	void
@@ -2028,6 +2056,11 @@ namespace Reflex
 	void
 	View::set_zoom (float zoom)
 	{
+		if (zoom == self->zoom) return;
+
+		if (zoom == 0)
+			argument_error(__FILE__, __LINE__);
+
 		self->zoom = zoom;
 		redraw();
 	}
@@ -2041,7 +2074,8 @@ namespace Reflex
 	void
 	View::set_capture (uint types)
 	{
-		if (types == self->capture) return;
+		Window* w = window();
+		if (!w || types == self->capture) return;
 
 		uint old      = self->capture;
 		self->capture = types;
@@ -2050,9 +2084,9 @@ namespace Reflex
 		bool capture    = types != CAPTURE_NONE;
 
 		if (capture && !registered)
-			View_register_capture(this);
+			Window_register_capture(w, this);
 		else if (!capture && registered)
-			View_unregister_capture(this);
+			Window_unregister_capture(w, this);
 
 		CaptureEvent e(~old & types, old & ~types);
 		on_capture(&e);
@@ -2508,6 +2542,11 @@ namespace Reflex
 	{
 	}
 
+	void
+	View::on_pointer_cancel (PointerEvent* e)
+	{
+	}
+
 	void
 	View::on_wheel (WheelEvent* e)
 	{

data/src/view.h

@@ -37,10 +37,6 @@ namespace Reflex
 
 	void View_update_shapes (View* view);
 
-	void View_register_capture   (View* view);
-
-	void View_unregister_capture (View* view);
-
 	void View_call_key_event     (View* view, const KeyEvent& event);
 
 	void View_call_pointer_event (View* view, const PointerEvent& event);