reflexion 0.1.38 → 0.1.39

data/src/pointer.cpp

@@ -1,6 +1,7 @@
 #include "pointer.h"
 
 
+#include <limits.h>
 #include <xot/time.h>
 #include "reflex/exception.h"
 
@@ -43,7 +44,9 @@ namespace Reflex
 
 		Point position;
 
-		uint modifiers, click_count, flags;
+		uint modifiers, flags;
+
+		ushort click_count, view_index;
 
 		double time;
 
@@ -51,14 +54,16 @@ namespace Reflex
 
 		Data (
 			ID id = -1, uint type = TYPE_NONE, Action action = ACTION_NONE,
-			const Point& position = 0, uint modifiers = 0, uint click_count = 0,
+			const Point& position = 0, uint modifiers = 0,
 			bool drag = false, bool enter = false, bool exit = false,
-			double time = 0)
+			uint click_count = 0, uint view_index = 0, double time = 0)
 		:	id(id), type(type), action(action),
-			position(position), modifiers(modifiers), click_count(click_count),
+			position(position), modifiers(modifiers),
 			flags(make_flags(drag, enter, exit)),
-			time(time)
+			click_count(click_count), view_index(view_index), time(time)
 		{
+			if (view_index >= USHRT_MAX)
+				argument_error(__FILE__, __LINE__);
 		}
 
 		uint make_flags (bool drag, bool enter, bool exit)
@@ -75,8 +80,6 @@ namespace Reflex
 	void
 	Pointer_update_positions (Pointer* pthis, std::function<void(Point*)> fun)
 	{
-		assert(pthis);
-
 		auto& self = pthis->self;
 		fun(&self->position);
 		if (self->prev)
@@ -89,6 +92,15 @@ namespace Reflex
 		pthis->self->id = id;
 	}
 
+	void
+	Pointer_set_view_index (Pointer* pthis, uint view_index)
+	{
+		if (view_index >= USHRT_MAX)
+			argument_error(__FILE__, __LINE__);
+
+		pthis->self->view_index = view_index;
+	}
+
 	void
 	Pointer_set_prev (Pointer* pthis, const Pointer* prev)
 	{
@@ -105,26 +117,24 @@ namespace Reflex
 
 	Pointer::Pointer (
 		ID id, uint type, Action action,
-		const Point& position, uint modifiers, uint click_count, bool drag,
-		double time)
+		const Point& position, uint modifiers, bool drag,
+		uint click_count, uint view_index, double time)
 	:	self(new Data(
 			id, type, action,
-			position, modifiers, click_count, drag, false, false,
-			time))
+			position, modifiers, drag, false, false,
+			click_count, view_index, time))
 	{
 	}
 
 	Pointer::Pointer (const This& obj)
-	:	self(new Data(*obj.self))
+	:	self(obj.self)
 	{
 	}
 
 	Pointer&
 	Pointer::operator = (const This& obj)
 	{
-		if (&obj == this) return *this;
-
-		*self = *obj.self;
+		self.operator=(obj.self);
 		return *this;
 	}
 
@@ -162,16 +172,22 @@ namespace Reflex
 		return self->modifiers;
 	}
 
+	bool
+	Pointer::is_drag () const
+	{
+		return self->flags & Data::DRAG;
+	}
+
 	uint
 	Pointer::click_count () const
 	{
 		return self->click_count;
 	}
 
-	bool
-	Pointer::is_drag () const
+	uint
+	Pointer::view_index () const
 	{
-		return self->flags & Data::DRAG;
+		return self->view_index;
 	}
 
 	double

data/src/pointer.h

@@ -5,7 +5,7 @@
 
 
 #include <functional>
-#include <reflex/pointer.h>
+#include "reflex/pointer.h"
 
 
 namespace Reflex
@@ -15,7 +15,9 @@ namespace Reflex
 	void Pointer_update_positions (
 		Pointer* pthis, std::function<void(Point*)> fun);
 
-	void Pointer_set_id   (Pointer* pthis, Pointer::ID id);
+	void Pointer_set_id (Pointer* pthis, Pointer::ID id);
+
+	void Pointer_set_view_index (Pointer* pthis, uint view_index);
 
 	void Pointer_set_prev (Pointer* pthis, const Pointer* prev);
 

data/src/selector.h

@@ -5,7 +5,7 @@
 
 
 #include <memory>
-#include <reflex/selector.h>
+#include "reflex/selector.h"
 
 
 namespace Reflex

data/src/shape.h

@@ -5,7 +5,7 @@
 
 
 #include <xot/util.h>
-#include <reflex/shape.h>
+#include "reflex/shape.h"
 
 
 class b2Shape;

data/src/style.h

@@ -4,7 +4,7 @@
 #define __REFLEX_SRC_STYLE_H__
 
 
-#include <reflex/style.h>
+#include "reflex/style.h"
 
 
 namespace Reflex

data/src/timer.h

@@ -6,7 +6,7 @@
 
 #include <vector>
 #include <list>
-#include <reflex/timer.h>
+#include "reflex/timer.h"
 
 
 namespace Reflex

data/src/view.cpp

@@ -1,6 +1,7 @@
 #include "view.h"
 
 
+#include <limits.h>
 #include <assert.h>
 #include <memory>
 #include <algorithm>
@@ -47,29 +48,34 @@ namespace Reflex
 
 			UPDATE_LAYOUT        = Xot::bit(5, FLAG_LAST),
 
-			FIT_TO_CONTENT       = Xot::bit(6, FLAG_LAST),
+			SORT_CHILDREN        = Xot::bit(6, FLAG_LAST),
 
-			HAS_VARIABLE_LENGTHS = Xot::bit(7, FLAG_LAST),
+			FIT_TO_CONTENT       = Xot::bit(7, FLAG_LAST),
 
-			NO_SHAPE             = Xot::bit(8, FLAG_LAST),
+			HAS_VARIABLE_LENGTHS = Xot::bit(8, FLAG_LAST),
+
+			NO_SHAPE             = Xot::bit(9, FLAG_LAST),
 
 		};// Flag
 
-		Window* window   = NULL;
+		Window* window     = NULL;
 
-		View* parent     = NULL;
+		View* parent       = NULL;
 
 		Bounds frame;
 
-		float zoom       = 1;
+		float zoom         = 1;
+
+		float angle        = 0;
 
-		float angle      = 0;
+		ushort capture     = CAPTURE_NONE;
 
-		ushort capture   = CAPTURE_NONE;
+		short hide_count   = 0;
 
-		short hide_count = 0;
+		ushort child_index = 0;
 
-		uint flags = FLAG_CLIP | FLAG_RESIZE_TO_FIT | REDRAW | UPDATE_LAYOUT | UPDATE_STYLE;
+		uint flags         =
+			FLAG_CLIP | FLAG_RESIZE_TO_FIT | REDRAW | UPDATE_LAYOUT | UPDATE_STYLE;
 
 		std::unique_ptr<Point>       ppivot;
 
@@ -99,6 +105,8 @@ namespace Reflex
 
 		std::unique_ptr<ChildList>   pchildren;
 
+		std::unique_ptr<ChildList>   pchildren_sorted;
+
 		Point& pivot ()
 		{
 			if (!ppivot) ppivot.reset(new Point);
@@ -243,9 +251,10 @@ namespace Reflex
 		{
 			assert(m && *m == 1 && ppivot && *ppivot != 0 && pbody);
 
+			Point pos   = pbody->position();
 			Point pivot = *ppivot * frame.size();
 			float angle = pbody->angle();
-			m->translate(pbody->position())
+			m->translate(pos.x, pos.y, frame.z)
 				.rotate(angle)
 				.translate( pivot)
 				.rotate(-angle)
@@ -304,10 +313,24 @@ namespace Reflex
 				view->remove_child(wall.get());
 		}
 
-		ChildList& children ()
+		ChildList* children (bool create = false, bool sort = false)
+		{
+			if (!pchildren)
+			{
+				if (!create) return NULL;
+				pchildren.reset(new ChildList);
+			}
+
+			if (sort && check_and_remove_flag(SORT_CHILDREN))
+				do_sort_children();
+
+			return sort && pchildren_sorted ? pchildren_sorted.get() : pchildren.get();
+		}
+
+		void sort_children (bool order_only = false)
 		{
-			if (!pchildren) pchildren.reset(new ChildList);
-			return *pchildren;
+			add_flag(SORT_CHILDREN);
+			if (!order_only && pchildren_sorted) pchildren_sorted.reset();
 		}
 
 		void add_flag (uint flag)
@@ -330,6 +353,50 @@ namespace Reflex
 			return Xot::check_and_remove_flag(&flags, flag);
 		}
 
+		private:
+
+			void do_sort_children ()
+			{
+				assert(pchildren);
+
+				auto& children = *pchildren;
+
+				size_t size = children.size();
+				if (size >= USHRT_MAX)
+					invalid_state_error(__FILE__, __LINE__, "too many children");
+
+				ushort index = 0;
+				bool have_z  = false;
+				for (auto& child : children)
+				{
+					child->self->child_index = index++;
+					have_z                  |= child->frame().z != 0;
+				}
+
+				if (!have_z)
+				{
+					pchildren_sorted.reset();
+					return;
+				}
+
+				if (!pchildren_sorted)
+				{
+					pchildren_sorted.reset(
+						new ChildList(children.begin(), children.end()));
+				}
+
+				std::sort(
+					pchildren_sorted->begin(), pchildren_sorted->end(),
+					[](const auto& a, const auto& b)
+					{
+						auto *aa = a->self.get(), *bb = b->self.get();
+						if (aa->frame.z != bb->frame.z)
+							return aa->frame.z     < bb->frame.z;
+						else
+							return aa->child_index < bb->child_index;
+					});
+			}
+
 	};// View::Data
 
 
@@ -351,8 +418,8 @@ namespace Reflex
 
 			void place_children ()
 			{
-				View::ChildList* pchildren = parent->self->pchildren.get();
-				if (!pchildren || pchildren->empty())
+				View::ChildList* children = parent->self->children();
+				if (!children || children->empty())
 					return;
 
 				bool leftward = flow_main_h < 0 || flow_sub_h < 0;
@@ -362,7 +429,7 @@ namespace Reflex
 					upward   ? parent_frame.height : 0);
 				Point position = start_position;
 
-				for (iterator begin = pchildren->begin(), end = pchildren->end(); true;)
+				for (iterator begin = children->begin(), end = children->end(); true;)
 				{
 					iterator line_end;
 					coord main_fill_size = 0;
@@ -653,11 +720,11 @@ namespace Reflex
 		view->self->window = window;
 		view->self->update_body_and_shapes();
 
-		View::ChildList* pchildren = view->self->pchildren.get();
-		if (pchildren)
+		View::ChildList* children = view->self->children();
+		if (children)
 		{
-			for (auto& pchild : *pchildren)
-				View_set_window(pchild.get(), window);
+			for (auto& child : *children)
+				View_set_window(child.get(), window);
 		}
 
 		if (view->self->window)
@@ -673,15 +740,15 @@ namespace Reflex
 	{
 		assert(parent);
 
-		View::ChildList* pchildren = parent->self->pchildren.get();
-		if (!pchildren) return;
+		View::ChildList* children = parent->self->children();
+		if (!children) return;
 
-		for (auto& pchild : *pchildren)
+		for (auto& child : *children)
 		{
-			assert(pchild);
+			assert(child);
 
-			if (pchild->self->has_flag(View::Data::HAS_VARIABLE_LENGTHS))
-				pchild->self->add_flag(View::Data::APPLY_STYLE);
+			if (child->self->has_flag(View::Data::HAS_VARIABLE_LENGTHS))
+				child->self->add_flag(View::Data::APPLY_STYLE);
 		}
 	}
 
@@ -733,6 +800,9 @@ namespace Reflex
 		if (update_body && (moved || rotated) && self->pbody)
 			self->update_body_frame();
 
+		if (moved && event.dz() != 0 && self->parent)
+			self->parent->self->sort_children(true);
+
 		if ((moved || resized) && self->parent)
 			self->parent->self->add_flag(View::Data::FIT_TO_CONTENT);
 
@@ -779,19 +849,19 @@ namespace Reflex
 	{
 		assert(result && view);
 
-		View::ChildList* pchildren = view->self->pchildren.get();
-		if (!pchildren) return;
+		View::ChildList* children = view->self->children();
+		if (!children) return;
 
-		for (auto& pchild : *pchildren)
+		for (auto& child : *children)
 		{
-			if (!pchild)
+			if (!child)
 				invalid_state_error(__FILE__, __LINE__);
 
-			if (pchild->selector().contains(selector))
-				result->push_back(pchild);
+			if (child->selector().contains(selector))
+				result->push_back(child);
 
 			if (recursive)
-				find_all_children(result, pchild.get(), selector, true);
+				find_all_children(result, child.get(), selector, true);
 		}
 	}
 
@@ -814,11 +884,11 @@ namespace Reflex
 
 		if (!recursive) return;
 
-		View::ChildList* pchildren = view->self->pchildren.get();
-		if (pchildren)
+		View::ChildList* children = view->self->children();
+		if (children)
 		{
-			for (auto& pchild : *pchildren)
-				find_all_styles(result, pchild.get(), selector, true);
+			for (auto& child : *children)
+				find_all_styles(result, child.get(), selector, true);
 		}
 	}
 
@@ -866,7 +936,10 @@ namespace Reflex
 			frame.set_position(m * Point(0));
 		}
 		else
-			frame.set_position(body->position());
+		{
+			Point pos = body->position();
+			frame.set_position(pos.x, pos.y, frame.z);
+		}
 
 		update_view_frame(view, frame, view->zoom(), body->angle(), false);
 	}
@@ -882,11 +955,11 @@ namespace Reflex
 
 		child_world->on_update(dt);
 
-		View::ChildList* pchildren = self->pchildren.get();
-		if (pchildren)
+		View::ChildList* children = self->children();
+		if (children)
 		{
-			for (auto& pchild : *pchildren)
-				update_view_body(pchild.get());
+			for (auto& child : *children)
+				update_view_body(child.get());
 		}
 	}
 
@@ -910,8 +983,8 @@ namespace Reflex
 
 			children.clear();
 			find_all_children(&children, view, sel, true);
-			for (auto& pchild : children)
-				pchild->self->add_flag(View::Data::UPDATE_STYLE);
+			for (auto& child : children)
+				child->self->add_flag(View::Data::UPDATE_STYLE);
 		}
 
 		sels->clear();
@@ -1010,11 +1083,11 @@ namespace Reflex
 
 		fire_timers(view, event.now());
 
-		View::ChildList* pchildren = self->pchildren.get();
-		if (pchildren)
+		View::ChildList* children = self->children();
+		if (children)
 		{
-			for (auto& pchild : *pchildren)
-				View_update_tree(pchild.get(), event);
+			for (auto& child : *children)
+				View_update_tree(child.get(), event);
 		}
 
 		update_view_shapes(view);
@@ -1148,13 +1221,13 @@ namespace Reflex
 
 		if (event->is_blocked()) return;
 
-		View::ChildList* pchildren = self->pchildren.get();
-		if (pchildren)
+		View::ChildList* children = self->children(false, true);
+		if (children)
 		{
-			for (auto& pchild : *pchildren)
+			for (auto& child : *children)
 			{
-				if (event->bounds() & pchild->self->frame)
-					View_draw_tree(pchild.get(), event, offset, clip);
+				if (event->bounds() & child->self->frame)
+					View_draw_tree(child.get(), event, offset, clip);
 			}
 		}
 
@@ -1321,15 +1394,14 @@ namespace Reflex
 	}
 
 	static void
-	call_children (View* parent, std::function<bool(View*)> fun)
+	call_children (View* parent, std::function<bool(View*)> fun, bool sort = true)
 	{
 		assert(parent);
 
-		auto* pchildren = parent->self->pchildren.get();
-		if (!pchildren) return;
+		auto* children = parent->self->children(false, sort);
+		if (!children) return;
 
-		auto end = pchildren->rend();
-		for (auto it = pchildren->rbegin(); it != end; ++it)
+		for (auto it = children->rbegin(), end = children->rend(); it != end; ++it)
 		{
 			if (!fun(it->get()))
 				break;
@@ -1367,6 +1439,9 @@ namespace Reflex
 			case Pointer::CANCEL: view->on_pointer_cancel(event); break;
 			default: break;
 		}
+
+		if (!event->is_captured())
+			PointerEvent_increment_view_indices(event);
 	}
 
 	static void
@@ -1381,7 +1456,7 @@ namespace Reflex
 		PointerEvent_each_pointer(&event, [&](const auto& pointer)
 		{
 			if (pointer.action() == Pointer::DOWN)
-				Window_register_capture(win, view, pointer.id());
+				Window_register_capture(win, view, pointer.id(), pointer.view_index());
 		});
 	}
 
@@ -1710,7 +1785,7 @@ namespace Reflex
 	{
 		assert(parent && child);
 
-		View::ChildList* children = parent->self->pchildren.get();
+		View::ChildList* children = parent->self->children();
 		if (!children) return;
 
 		auto end = children->end();
@@ -1719,7 +1794,10 @@ namespace Reflex
 
 		children->erase(it);
 		if (children->empty())
+		{
 			parent->self->pchildren.reset();
+			parent->self->pchildren_sorted.reset();
+		}
 	}
 
 	void
@@ -1735,7 +1813,7 @@ namespace Reflex
 		else if (found != belong)
 			invalid_state_error(__FILE__, __LINE__);
 
-		self->children().push_back(child);
+		self->children(true)->push_back(child);
 
 		View* prev_parent = child->parent();
 		set_parent(child, this);
@@ -1743,6 +1821,8 @@ namespace Reflex
 		if (prev_parent)
 			erase_child_from_children(prev_parent, child);
 
+		self->sort_children();
+
 		update_view_layout(this);
 	}
 
@@ -1763,16 +1843,18 @@ namespace Reflex
 
 		erase_child_from_children(this, child);
 
+		self->sort_children();
+
 		update_view_layout(this);
 	}
 
 	void
 	View::clear_children ()
 	{
-		if (!self->pchildren || self->pchildren->empty()) return;
+		auto* children = self->children();
+		if (!children || children->empty()) return;
 
-		auto children = *self->pchildren;
-		for (auto& child : children)
+		for (auto& child : *children)
 			remove_child(child);
 	}
 
@@ -2264,9 +2346,9 @@ namespace Reflex
 		bool capture    = types != CAPTURE_NONE;
 
 		if (capture && !registered)
-			Window_register_capture(w, this);
+			Window_register_capture(w, this, CAPTURE_ALL);
 		else if (!capture && registered)
-			Window_unregister_capture(w, this);
+			Window_unregister_capture(w, this, CAPTURE_ALL);
 
 		CaptureEvent e(~old & types, old & ~types);
 		on_capture(&e);

data/src/view.h

@@ -4,7 +4,7 @@
 #define __REFLEX_SRC_VIEW_H__
 
 
-#include <reflex/view.h>
+#include "reflex/view.h"
 
 
 namespace Reflex

data/src/win32/defs.h

@@ -5,7 +5,7 @@
 
 
 #include <windows.h>
-#include <reflex/defs.h>
+#include "reflex/defs.h"
 
 
 namespace Reflex