RubyGems - reflexion - Versions diffs - 0.1.10 → 0.1.11 - Mend

reflexion 0.1.10 → 0.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (54) hide show

checksums.yaml +4 -4
data/.doc/ext/reflex/body.cpp +53 -0
data/.doc/ext/reflex/native.cpp +0 -4
data/.doc/ext/reflex/selector.cpp +3 -3
data/.doc/ext/reflex/style.cpp +390 -30
data/.doc/ext/reflex/style_length.cpp +1 -1
data/.doc/ext/reflex/view.cpp +24 -6
data/VERSION +1 -1
data/ext/reflex/body.cpp +59 -0
data/ext/reflex/native.cpp +0 -4
data/ext/reflex/selector.cpp +3 -3
data/ext/reflex/style.cpp +432 -32
data/ext/reflex/style_length.cpp +1 -1
data/ext/reflex/view.cpp +25 -5
data/include/reflex/body.h +16 -0
data/include/reflex/ruby.h +5 -3
data/include/reflex/ruby/style.h +11 -0
data/include/reflex/selector.h +7 -1
data/include/reflex/style.h +93 -27
data/include/reflex/view.h +8 -4
data/lib/reflex.rb +0 -2
data/lib/reflex/body.rb +1 -0
data/lib/reflex/button.rb +1 -0
data/lib/reflex/selector.rb +10 -1
data/lib/reflex/style.rb +15 -0
data/lib/reflex/style_length.rb +1 -1
data/lib/reflex/view.rb +5 -2
data/lib/reflex/window.rb +2 -2
data/samples/reflexion/breakout.rb +4 -9
data/src/body.cpp +61 -0
data/src/ios/event.mm +1 -3
data/src/ios/native_window.mm +3 -20
data/src/ios/opengl_view.mm +1 -1
data/src/ios/window.mm +7 -0
data/src/selector.cpp +38 -16
data/src/style.cpp +515 -161
data/src/view.cpp +371 -242
data/src/world.cpp +8 -0
data/test/test_selector.rb +14 -12
data/test/test_style.rb +11 -6
data/test/test_style_length.rb +5 -6
data/test/test_view.rb +8 -7
metadata +2 -17
data/.doc/ext/reflex/style_length2.cpp +0 -149
data/.doc/ext/reflex/style_length4.cpp +0 -192
data/ext/reflex/style_length2.cpp +0 -157
data/ext/reflex/style_length4.cpp +0 -204
data/include/reflex/ruby/style_length.h +0 -63
data/include/reflex/style_length.h +0 -147
data/lib/reflex/style_length2.rb +0 -34
data/lib/reflex/style_length4.rb +0 -38
data/src/style_length.cpp +0 -341
data/test/test_style_length2.rb +0 -50
data/test/test_style_length4.rb +0 -56

data/src/view.cpp CHANGED Viewed

@@ -15,37 +15,38 @@ namespace Reflex
 {
-	void set_focus (Window* window, View* view);
-	void register_capture (View* view);
-	void unregister_capture (View* view);
+	bool set_style_owner (Style* style, View* owner);
 	struct View::Data
 	{
-		Window* window;
+		typedef std::set<Selector> SelectorSet;
-		View* parent;
+		enum Flags
+		{
-		Bounds frame;
+			ACTIVE         = 0x1 << 0,
-		float angle, scale;
+			UPDATE_STYLE   = 0x1 << 1,
-		boost::scoped_ptr<Selector>  pselector;
+			UPDATE_LAYOUT  = 0x1 << 2,
-		boost::scoped_ptr<Point>     pscroll;
+			UPDATING_WORLD = 0x1 << 3,
-		boost::scoped_ptr<ChildList> pchildren;
+			REMOVE_SELF    = 0x1 << 4,
-		boost::scoped_ptr<StyleList> pstyles;
+			DEFAULT_FLAGS  = UPDATE_STYLE | UPDATE_LAYOUT
-		boost::scoped_ptr<World>     pworld;
+		};// Flags
-		boost::scoped_ptr<Body>      pbody;
+		Window* window;
-		Style style;
+		View* parent;
+		Bounds frame;
+		float zoom, angle;
 		ushort capture;
@@ -53,9 +54,25 @@ namespace Reflex
 		uint flags;
+		boost::scoped_ptr<Selector>    pselector;
+		boost::scoped_ptr<SelectorSet> pselectors_for_update;
+		boost::scoped_ptr<Point>       pscroll;
+		boost::scoped_ptr<ChildList>   pchildren;
+		boost::scoped_ptr<Style>       pstyle;
+		boost::scoped_ptr<StyleList>   pstyles;
+		boost::scoped_ptr<World>       pworld;
+		boost::scoped_ptr<Body>        pbody;
 		Data ()
-		:	window(NULL), parent(NULL), angle(0), scale(1),
-			capture(CAPTURE_NONE), hide_count(0), flags(0)
+		:	window(NULL), parent(NULL), zoom(1), angle(0),
+			capture(CAPTURE_NONE), hide_count(0), flags(DEFAULT_FLAGS)
 		{
 		}
@@ -69,6 +86,12 @@ namespace Reflex
 			return *pselector;
 		}
+		SelectorSet& selectors_for_update ()
+		{
+			if (!pselectors_for_update) pselectors_for_update.reset(new SelectorSet);
+			return *pselectors_for_update;
+		}
 		Point& scroll ()
 		{
 			if (!pscroll) pscroll.reset(new Point);
@@ -81,6 +104,16 @@ namespace Reflex
 			return *pchildren;
 		}
+		Style& style (View* this_)
+		{
+			if (!pstyle)
+			{
+				pstyle.reset(new Style);
+				set_style_owner(pstyle.get(), this_);
+			}
+			return *pstyle;
+		}
 		StyleList& styles ()
 		{
 			if (!pstyles) pstyles.reset(new StyleList);
@@ -139,73 +172,118 @@ namespace Reflex
 			this_->redraw();
 		}
+		void add_flag (uint flag)
+		{
+			flags |= flag;
+		}
+		void remove_flag (uint flag)
+		{
+			flags &= ~flag;
+		}
+		bool has_flag (uint flag) const
+		{
+			return flags & flag;
+		}
 	};// View::Data
 	void
-	set_window (View* this_, Window* window_)
+	set_window (View* view, Window* window_)
 	{
-		if (!this_)
-			argument_error(__FILE__, __LINE__);
+		assert(view);
-		Window* current = this_->self->window;
+		Window* current = view->self->window;
 		if (current == window_) return;
 		if (current)
 		{
-			this_->set_capture(View::CAPTURE_NONE);
+			view->set_capture(View::CAPTURE_NONE);
 			Event e;
-			this_->on_detach(&e);
+			view->on_detach(&e);
 		}
-		this_->self->window = window_;
+		view->self->window = window_;
-		View::child_iterator end = this_->child_end();
-		for (View::child_iterator it = this_->child_begin(); it != end; ++it)
+		View::child_iterator end = view->child_end();
+		for (View::child_iterator it = view->child_begin(); it != end; ++it)
 			set_window(it->get(), window_);
-		if (this_->self->window)
+		if (view->self->window)
 		{
 			Event e;
-			this_->on_attach(&e);
-			this_->resize_to_fit();
+			view->on_attach(&e);
+			view->resize_to_fit();
 		}
 	}
 	static void
-	set_parent (View* this_, View* parent_)
+	set_parent (View* view, View* parent)
 	{
-		if (!this_)
-			argument_error(__FILE__, __LINE__);
+		assert(view);
+		View::Data* self = view->self.get();
-		View* current = this_->self->parent;
-		if (current == parent_) return;
+		View* current = self->parent;
+		if (current == parent) return;
-		if (current && parent_)
+		if (current && parent)
 		{
 			reflex_error(__FILE__, __LINE__,
 				"view '%s' already belongs to another parent '%s'.",
-				this_->name(), this_->self->parent->name());
+				view->name(), self->parent->name());
 		}
-		this_->self->parent = parent_;
-		set_window(this_, parent_ ? parent_->window() : NULL);
+		self->parent = parent;
+		set_window(view, parent ? parent->window() : NULL);
 	}
-	static void reflow_children (View* parent, const FrameEvent* event = NULL);
+	bool
+	is_view_active (View* view)
+	{
+		assert(view);
+		return view->self->has_flag(View::Data::ACTIVE);
+	}
+	static bool
+	remove_self (View* view)
+	{
+		assert(view);
+		View::Data* self = view->self.get();
+		if (!self->has_flag(View::Data::REMOVE_SELF) || !self->parent)
+			return false;
+		self->parent->remove_child(view);
+		return true;
+	}
 	static void
-	update_view_frame (View* view, const Bounds& frame, float angle, bool update_body)
+	update_layout (View* view, bool update_parent = false)
 	{
-		if (!view)
-			argument_error(__FILE__, __LINE__);
+		assert(view);
+		View::Data* self = view->self.get();
-		if (!*view)
-			invalid_state_error(__FILE__, __LINE__);
+		if (self->has_flag(View::Data::UPDATE_LAYOUT))
+			return;
+		self->add_flag(View::Data::UPDATE_LAYOUT);
+		if (update_parent && self->parent)
+			update_layout(self->parent, true);
+	}
+	static void
+	update_view_frame (View* view, const Bounds& frame, float angle, bool update_body)
+	{
+		assert(view);
 		View::Data* self = view->self.get();
-		if (frame == self->frame && angle == self->angle) return;
+		if (frame == self->frame && angle == self->angle)
+			return;
 		FrameEvent event(frame, self->frame, angle, self->angle);
 		self->frame = frame;
@@ -224,19 +302,27 @@ namespace Reflex
 			self->resize_world(view);
 			view->on_resize(&event);
-			reflow_children(view, &event);
+			update_layout(view, true);
 		}
 		view->redraw();
 	}
 	static void
-	update_world (View* view, float dt)
+	update_view_world (View* view, float dt)
 	{
-		World* world = view->self->pworld.get();
-		if (world) world->step(dt);
+		assert(view);
+		View::Data* self = view->self.get();
-		Body* body = view->self->pbody.get();
+		World* world = self->pworld.get();
+		if (world)
+		{
+			self->add_flag(View::Data::UPDATING_WORLD);
+			world->step(dt);
+			self->remove_flag(View::Data::UPDATING_WORLD);
+		}
+		Body* body = self->pbody.get();
 		if (body)
 		{
 			Bounds b = view->frame();
@@ -245,24 +331,155 @@ namespace Reflex
 		}
 	}
+	void
+	update_styles_for_selector (View* view, const Selector& selector)
+	{
+		assert(view);
+		View::Data* self = view->self.get();
+		if (selector.is_empty())
+			self->add_flag(View::Data::UPDATE_STYLE);
+		else
+			self->selectors_for_update().insert(selector);
+	}
+	static void
+	update_views_for_selectors (View* view)
+	{
+		assert(view);
+		View::Data* self = view->self.get();
+		View::Data::SelectorSet* sels = self->pselectors_for_update.get();
+		if (!sels)
+			return;
+		Selector* view_sel = self->pselector.get();
+		View::ChildList children;
+		View::Data::SelectorSet::iterator end = sels->end();
+		for (View::Data::SelectorSet::iterator it = sels->begin(); it != end; ++it)
+		{
+			if (view_sel && view_sel->contains(*it))
+				self->add_flag(View::Data::UPDATE_STYLE);
+			view->find_children(&children, *it, true);
+			for (View::ChildList::iterator jt = children.begin(); jt != children.end(); ++jt)
+				(*jt)->self->add_flag(View::Data::UPDATE_STYLE);
+		}
+		sels->clear();
+	}
+	static void
+	find_all_styles (
+		View::StyleList* result, const View* view, const Selector& selector, bool recursive)
+	{
+		View::const_style_iterator end = view->style_end();
+		for (View::const_style_iterator it = view->style_begin(); it != end; ++it)
+		{
+			if (selector.contains(it->selector()))
+				result->push_back(*it);
+		}
+		if (recursive)
+		{
+			View::const_child_iterator end = view->child_end();
+			for (View::const_child_iterator it = view->child_begin(); it != end; ++it)
+				find_all_styles(result, it->get(), selector, true);
+		}
+	}
+	static void
+	get_styles_for_selector (
+		View::StyleList* styles, View* view, const Selector& selector)
+	{
+		assert(styles);
+		View* parent = view->parent();
+		if (parent)
+			get_styles_for_selector(styles, parent, selector);
+		find_all_styles(styles, view, selector, false);
+	}
+	static void
+	get_styles_for_view (View::StyleList* styles, View* view)
+	{
+		Selector* sel = view->self->pselector.get();
+		if (!sel || sel->is_empty())
+			return;
+		get_styles_for_selector(styles, view, *sel);
+	}
+	static void
+	update_view_style (View* view)
+	{
+		assert(view);
+		View::Data* self = view->self.get();
+		if (!self->has_flag(View::Data::UPDATE_STYLE))
+			return;
+		View::StyleList styles;
+		get_styles_for_view(&styles, view);
+		Style style;
+		for (View::StyleList::iterator it = styles.begin(); it != styles.end(); ++it)
+		{
+			void override_style (Style*, const Style&);
+			override_style(&style, *it);
+		}
+		void apply_style (View*, const Style&);
+		apply_style(view, style);
+		self->remove_flag(View::Data::UPDATE_STYLE);
+	}
+	static void reflow_children (View* parent, const FrameEvent* event = NULL);
+	static void
+	update_view_layout (View* view)
+	{
+		assert(view);
+		View::Data* self = view->self.get();
+		if (!self->has_flag(View::Data::UPDATE_LAYOUT))
+			return;
+		reflow_children(view);
+		self->remove_flag(View::Data::UPDATE_LAYOUT);
+	}
 	void
 	update_view_tree (View* view, const UpdateEvent& event)
 	{
 		if (!view)
 			argument_error(__FILE__, __LINE__);
+		if (event.is_blocked() || remove_self(view))
+			return;
 		UpdateEvent e = event;
-		update_world(view, e.dt);
+		update_view_world(view, e.dt);
 		view->on_update(&e);
+		update_views_for_selectors(view);
+		update_view_style(view);
 		View::child_iterator end = view->child_end();
 		for (View::child_iterator it = view->child_begin(); it != end; ++it)
 			update_view_tree(it->get(), e);
+		update_view_layout(view);
 	}
 	static void
 	draw_world (View* view, Painter* painter)
 	{
+		assert(view);
 		World* world = view->self->pworld.get();
 		if (world) world->draw(painter);
 	}
@@ -274,7 +491,8 @@ namespace Reflex
 		if (!view)
 			argument_error(__FILE__, __LINE__);
-		if (view->hidden()) return;
+		if (event.is_blocked() || view->hidden())
+			return;
 		DrawEvent e = event;
 		Painter*  p = e.painter;
@@ -290,8 +508,8 @@ namespace Reflex
 		float angle = view->self->angle;
 		if (angle != 0) p->rotate(angle);
-		float scale = view->self->scale;
-		if (scale != 1) p->scale(scale);
+		float zoom = view->self->zoom;
+		if (zoom != 1 && zoom > 0) p->scale(zoom, zoom);
 		pos += offset;
 		Bounds clip2 = clip & frame.move_to(pos);
@@ -633,16 +851,35 @@ namespace Reflex
 		}
 	}
 #endif
+	static bool
+	get_style_flow (Style::Flow* main, Style::Flow* sub, const Style* style)
+	{
+		void get_default_flow (Style::Flow*, Style::Flow*);
+		assert(main && sub);
+		if (style)
+			style->get_flow(main, sub);
+		else
+			get_default_flow(main, sub);
+		return *main != Style::FLOW_NONE;
+	}
 	static void
 	reflow_children (View* parent, const FrameEvent* event)
 	{
-		if (!parent)
-			argument_error(__FILE__, __LINE__);
+		assert(parent);
-		if (!parent->self->pchildren) return;
+		View::ChildList* children = parent->self->pchildren.get();
+		if (!children || children->empty()) return;
-		View::ChildList& children = *parent->self->pchildren;
-		if (children.empty()) return;
+		const Style* style = parent->style();
+		Style::Flow flow_main, flow_sub;
+		if (!get_style_flow(&flow_main, &flow_sub, style))
+			return;
 #if 0
 		int main_h, main_v, sub_h, sub_v;
@@ -650,25 +887,20 @@ namespace Reflex
 		get_flow_factor(&sub_h,  &sub_v,  flow_sub);
 #endif
-		const Style& style = parent->style();
-		Style::Flow flow_main, flow_sub;
-		style.get_flow(&flow_main, &flow_sub);
 		const Bounds& parent_frame = parent->self->frame;
 		coord x = 0, y = 0, size_max = 0;
 		int child_count = 0;
 		bool multiline = flow_sub != Style::FLOW_NONE;
-		size_t nchildren = children.size();
+		size_t nchildren = children->size();
 		for (size_t i = 0; i < nchildren; ++i)
 		{
-			View* child = children[i].get();
+			View* child = (*children)[i].get();
 			Bounds child_frame = child->self->frame;
 			if (
 				(x + child_frame.width) > parent_frame.width &&
-				child_count > 0)// && multiline)
+				child_count > 0 && multiline)
 			{
 				x           = 0;
 				y          += size_max;
@@ -784,9 +1016,6 @@ namespace Reflex
 	void
 	View::show ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		int new_count = self->hide_count - 1;
 		if (new_count == 0)
 		{
@@ -803,9 +1032,6 @@ namespace Reflex
 	void
 	View::hide ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		int new_count = self->hide_count + 1;
 		if (new_count == 1)
 		{
@@ -822,18 +1048,12 @@ namespace Reflex
 	bool
 	View::hidden () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		return self->hide_count > 0;
 	}
 	void
 	View::redraw ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		Window* w = window();
 		if (!w) return;
@@ -846,9 +1066,6 @@ namespace Reflex
 		if (!child || child == this)
 			argument_error(__FILE__, __LINE__);
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		bool found  = std::find(child_begin(), child_end(), child) != child_end();
 		bool belong = child->parent() == this;
 		if (found && belong)
@@ -856,8 +1073,12 @@ namespace Reflex
 		else if (found != belong)
 			invalid_state_error(__FILE__, __LINE__);
+		child->self->add_flag(View::Data::ACTIVE);
 		self->children().push_back(child);
 		set_parent(child, this);
+		update_layout(this);
 	}
 	void
@@ -866,14 +1087,19 @@ namespace Reflex
 		if (!child || child == this)
 			argument_error(__FILE__, __LINE__);
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (!self->pchildren) return;
 		child_iterator it = std::find(child_begin(), child_end(), child);
 		if (it == child_end()) return;
+		child->self->remove_flag(View::Data::ACTIVE);
+		if (self->has_flag(Data::UPDATING_WORLD))
+		{
+			child->self->add_flag(View::Data::REMOVE_SELF);
+			return;
+		}
 		if (child->parent() != this)
 			invalid_state_error(__FILE__, __LINE__);
@@ -881,6 +1107,8 @@ namespace Reflex
 		set_parent(child, NULL);
 		self->pchildren->erase(it);
+		update_layout(this);
 	}
 	static void
@@ -894,7 +1122,7 @@ namespace Reflex
 			if (!child)
 				invalid_state_error(__FILE__, __LINE__);
-			if (selector.match(child->selector()))
+			if (child->selector().contains(selector))
 				result->push_back(*it);
 			if (recursive) find_all_children(result, child, selector, true);
@@ -905,9 +1133,6 @@ namespace Reflex
 	View::find_children (
 		ChildList* result, const Selector& selector, bool recursive) const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		result->clear();
 		find_all_children(result, this, selector, recursive);
 	}
@@ -917,9 +1142,6 @@ namespace Reflex
 	View::child_iterator
 	View::child_begin ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (!self->pchildren) return empty_children.begin();
 		return self->pchildren->begin();
 	}
@@ -927,9 +1149,6 @@ namespace Reflex
 	View::const_child_iterator
 	View::child_begin () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (!self->pchildren) return empty_children.begin();
 		return self->pchildren->begin();
 	}
@@ -937,9 +1156,6 @@ namespace Reflex
 	View::child_iterator
 	View::child_end ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (!self->pchildren) return empty_children.end();
 		return self->pchildren->end();
 	}
@@ -947,43 +1163,44 @@ namespace Reflex
 	View::const_child_iterator
 	View::child_end () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (!self->pchildren) return empty_children.end();
 		return self->pchildren->end();
 	}
-	Style&
-	View::style ()
+	Style*
+	View::style (bool create)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-		return self->style;
+		return create ? &self->style(this) : self->pstyle.get();
 	}
-	const Style&
+	const Style*
 	View::style () const
 	{
-		return const_cast<View*>(this)->style();
+		return const_cast<View*>(this)->style(false);
+	}
+	static Style*
+	add_view_style (View* view, Style style)
+	{
+		assert(view && *view);
+		if (!set_style_owner(&style, view))
+			return NULL;
+		View::StyleList* styles = &view->self->styles();
+		styles->push_back(style);
+		return &styles->back();
 	}
 	void
 	View::add_style (const Style& style)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
-		self->styles().push_back(style);
+		add_view_style(this, style);
 	}
 	void
 	View::remove_style (const Style& style)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (!self->pstyles) return;
 		style_iterator it = std::find(style_begin(), style_end(), style);
@@ -993,10 +1210,10 @@ namespace Reflex
 	}
 	Style*
-	View::get_style (const Selector& selector)
+	View::get_style (const Selector& selector, bool create)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
+		if (selector.is_empty())
+			return style(create);
 		style_iterator end = style_end();
 		for (style_iterator it = style_begin(); it != end; ++it)
@@ -1005,6 +1222,13 @@ namespace Reflex
 				return &*it;
 		}
+		if (create)
+		{
+			Style s;
+			s.set_selector(selector);
+			return add_view_style(this, s);
+		}
 		return NULL;
 	}
@@ -1014,31 +1238,9 @@ namespace Reflex
 		return const_cast<View*>(this)->get_style(selector);
 	}
-	static void
-	find_all_styles (
-		View::StyleList* result, const View* view, const Selector& selector, bool recursive)
-	{
-		View::const_style_iterator end = view->style_end();
-		for (View::const_style_iterator it = view->style_begin(); it != end; ++it)
-		{
-			if (selector.match(it->selector()))
-				result->push_back(*it);
-		}
-		if (recursive)
-		{
-			View::const_child_iterator end = view->child_end();
-			for (View::const_child_iterator it = view->child_begin(); it != end; ++it)
-				find_all_styles(result, it->get(), selector, true);
-		}
-	}
 	void
 	View::find_styles (StyleList* result, const Selector& selector, bool recursive) const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		result->clear();
 		find_all_styles(result, this, selector, recursive);
 	}
@@ -1048,9 +1250,6 @@ namespace Reflex
 	View::style_iterator
 	View::style_begin ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (!self->pstyles) return empty_styles.begin();
 		return self->pstyles->begin();
 	}
@@ -1058,9 +1257,6 @@ namespace Reflex
 	View::const_style_iterator
 	View::style_begin () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (!self->pstyles) return empty_styles.begin();
 		return self->pstyles->begin();
 	}
@@ -1068,9 +1264,6 @@ namespace Reflex
 	View::style_iterator
 	View::style_end ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (!self->pstyles) return empty_styles.end();
 		return self->pstyles->end();
 	}
@@ -1078,9 +1271,6 @@ namespace Reflex
 	View::const_style_iterator
 	View::style_end () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (!self->pstyles) return empty_styles.end();
 		return self->pstyles->end();
 	}
@@ -1091,6 +1281,7 @@ namespace Reflex
 		Window* w = window();
 		if (!w) return;
+		void set_focus (Window*, View*);
 		if (state)
 			set_focus(w, this);
 		else if (w->focus() == this)
@@ -1113,25 +1304,21 @@ namespace Reflex
 	void
 	View::resize_to_fit ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		Point size = content_size();
 		if (size.x < 0 && size.y < 0 && size.z <= 0) return;
+		const Style* st = style();
 		Bounds b = frame();
-		if (size.x >= 0) b.width  = size.x;
-		if (size.y >= 0) b.height = size.y;
-		if (size.z >= 0) b.depth  = size.z;
+		if ((!st || !st->width())  && size.x >= 0) b.width  = size.x;
+		if ((!st || !st->height()) && size.y >= 0) b.height = size.y;
+		if (                          size.z >= 0) b.depth  = size.z;
 		set_frame(b);
 	}
 	Point
 	View::content_size () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		return -1;
 	}
@@ -1164,37 +1351,25 @@ namespace Reflex
 	void
 	View::set_name (const char* name)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		self->selector().set_name(name);
 	}
 	const char*
 	View::name () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		const Selector* sel = self->pselector.get();
-		return sel ? sel->name() : NULL;
+		return sel ? sel->name() : "";
 	}
 	void
 	View::add_tag (const char* tag)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		self->selector().add_tag(tag);
 	}
 	void
 	View::remove_tag (const char* tag)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		Selector* sel = self->pselector.get();
 		if (!sel) return;
@@ -1206,9 +1381,6 @@ namespace Reflex
 	View::tag_iterator
 	View::tag_begin ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		Selector* sel = self->pselector.get();
 		return sel ? sel->begin() : empty_tags.begin();
 	}
@@ -1216,9 +1388,6 @@ namespace Reflex
 	View::const_tag_iterator
 	View::tag_begin () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		const Selector* sel = self->pselector.get();
 		return sel ? sel->begin() : empty_tags.begin();
 	}
@@ -1226,9 +1395,6 @@ namespace Reflex
 	View::tag_iterator
 	View::tag_end ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		Selector* sel = self->pselector.get();
 		return sel ? sel->end() : empty_tags.end();
 	}
@@ -1236,9 +1402,6 @@ namespace Reflex
 	View::const_tag_iterator
 	View::tag_end () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		const Selector* sel = self->pselector.get();
 		return sel ? sel->end() : empty_tags.end();
 	}
@@ -1246,18 +1409,12 @@ namespace Reflex
 	void
 	View::set_selector (const Selector& selector)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		self->selector() = selector;
 	}
 	Selector&
 	View::selector ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		return self->selector();
 	}
@@ -1266,9 +1423,6 @@ namespace Reflex
 	{
 		static const Selector EMPTY;
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		const Selector* sel = self->pselector.get();
 		return sel ? *sel : EMPTY;
 	}
@@ -1288,12 +1442,22 @@ namespace Reflex
 	const Bounds&
 	View::frame () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		return self->frame;
 	}
+	void
+	View::set_zoom (float zoom)
+	{
+		self->zoom = zoom;
+		redraw();
+	}
+	float
+	View::zoom () const
+	{
+		return self->zoom;
+	}
 #if 0
 	void
 	View::set_angle (float degree)
@@ -1305,9 +1469,6 @@ namespace Reflex
 	float
 	View::angle () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		return self->angle;
 	}
@@ -1316,13 +1477,11 @@ namespace Reflex
 	void
 	View::scroll_to (coord x, coord y, coord z)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		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();
 	}
@@ -1348,9 +1507,6 @@ namespace Reflex
 	const Point&
 	View::scroll () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (self->pscroll)
 			return self->scroll();
 		else
@@ -1360,9 +1516,6 @@ namespace Reflex
 	void
 	View::set_capture (uint types)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		if (types == self->capture) return;
 		uint old      = self->capture;
@@ -1372,9 +1525,15 @@ namespace Reflex
 		bool capture    = types != CAPTURE_NONE;
 		if (capture && !registered)
+		{
+			void register_capture (View*);
 			register_capture(this);
+		}
 		else if (!capture && registered)
+		{
+			void unregister_capture (View*);
 			unregister_capture(this);
+		}
 		CaptureEvent e(~old & types, old & ~types);
 		on_capture(&e);
@@ -1383,18 +1542,12 @@ namespace Reflex
 	uint
 	View::capture () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		return self->capture;
 	}
 	View*
 	View::parent ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		return self->parent;
 	}
@@ -1407,9 +1560,6 @@ namespace Reflex
 	Window*
 	View::window ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		return self->window;
 	}
@@ -1422,9 +1572,6 @@ namespace Reflex
 	Body*
 	View::body ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		return self->body(this);
 	}
@@ -1437,9 +1584,6 @@ namespace Reflex
 	float
 	View::meter2pixel (float meter, bool create_world)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		Body* body = self->pbody.get();
 		if (body)
 			return body->meter2pixel(meter);
@@ -1482,9 +1626,6 @@ namespace Reflex
 	void
 	View::set_gravity (const Point& vector)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		World* w = self->world(this);
 		if (!w)
 			invalid_state_error(__FILE__, __LINE__);
@@ -1495,9 +1636,6 @@ namespace Reflex
 	Point
 	View::gravity () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		World* w = self->pworld.get();
 		return w ? w->gravity() : 0;
 	}
@@ -1505,9 +1643,6 @@ namespace Reflex
 	Body*
 	View::wall ()
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		return self->world(this)->wall();
 	}
@@ -1520,9 +1655,6 @@ namespace Reflex
 	void
 	View::set_debug (bool state)
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		World* w = self->world(this);
 		if (!w)
 			invalid_state_error(__FILE__, __LINE__);
@@ -1533,9 +1665,6 @@ namespace Reflex
 	bool
 	View::debugging () const
 	{
-		if (!*this)
-			invalid_state_error(__FILE__, __LINE__);
 		World* w = self->pworld.get();
 		return w ? w->debugging() : false;
 	}