X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.h;h=b2f69d3bb2eae41cf35183d04f8cc5f1b47531ef;hb=9678abb23abe450109e2feda081f5bba5f20cc94;hp=bca1c59cff79815872c9dd8dca20bcfd0a70ae23;hpb=1b29f1987b8891852a606afbb03e5e08b16c8c3e;p=libs%2Fgltk.git

diff --git a/source/container.h b/source/container.h
index bca1c59..b2f69d3 100644
--- a/source/container.h
+++ b/source/container.h
@@ -4,26 +4,27 @@
 #include <list>
 #include <stdexcept>
 #include <sigc++/trackable.h>
+#include "mspgltk_api.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
-class hierarchy_error: public std::logic_error
+class MSPGLTK_API hierarchy_error: public std::logic_error
 {
 public:
 	hierarchy_error(const std::string &);
-	virtual ~hierarchy_error() throw() { }
 };
 
 
-class Container: virtual public Widget
+class MSPGLTK_API Container: virtual public Widget
 {
 protected:
 	struct Child: public sigc::trackable
 	{
 		Container &container;
-		Widget *widget;
+		Widget *widget = nullptr;
+		Time::TimeDelta time_since_animate;
 
 		Child(Container &, Widget *);
 		virtual ~Child();
@@ -32,16 +33,21 @@ protected:
 		void request_focus();
 		void grab_pointer();
 		void ungrab_pointer();
+		void request_animation(const Time::TimeDelta &);
+		void rebuild_needed();
 	};
 
 	std::list<Child *> children;
-	Widget *click_focus;
-	unsigned click_button;
-	Widget *pointer_focus;
-	bool pointer_grabbed;
-	Widget *input_focus;
+	Widget *click_focus = nullptr;
+	unsigned click_button = 0;
+	Widget *pointer_focus = nullptr;
+	bool pointer_grabbed = false;
+	Widget *input_focus = nullptr;
+	Widget *saved_input_focus = nullptr;
+	Widget *touch_focus = nullptr;
+	bool children_rebuild_needed = false;
 
-	Container();
+	Container() = default;
 public:
 	virtual ~Container();
 
@@ -49,31 +55,51 @@ public:
 	void remove(Widget &);
 protected:
 	virtual Child *create_child(Widget *);
+	Geometry determine_child_geometry(const Widget &, const Part &) const;
+	void autosize_child(const Widget &, const Part &, Geometry &) const;
+	void reposition_child(Widget &, const Part &) const;
 public:
 	std::list<Widget *> get_children() const;
-	Widget *get_child_at(int, int);
-	Widget *get_descendant_at(int, int);
+	Widget *find_child_at(int, int) const;
+	Widget *find_descendant_at(int, int) const;
 	void raise(Widget &);
 
 protected:
-	void set_pointer_focus(Widget *);
+	void set_pointer_focus(Widget *, bool = false);
 	void set_input_focus(Widget *);
 public:
 	Widget *get_input_focus() const { return input_focus; }
 	Widget *get_final_input_focus() const;
 
-	virtual void button_press(int, int, unsigned);
-	virtual void button_release(int, int, unsigned);
-	virtual void pointer_motion(int, int);
-	virtual void pointer_leave();
-	virtual void key_press(unsigned, unsigned);
-	virtual void key_release(unsigned, unsigned);
-	virtual void character(wchar_t);
-	virtual void focus_out();
+private:
+	void check_animation_interval();
+
+protected:
+	void rebuild_hierarchy() override;
+
+public:
+	void button_press(int, int, unsigned) override;
+	void button_release(int, int, unsigned) override;
+	void pointer_motion(int, int) override;
+private:
+	Widget *get_pointer_target(int, int, bool) const;
+public:
+	void pointer_leave() override;
+	void touch_press(int, int, unsigned) override;
+	void touch_release(int, int, unsigned) override;
+	void touch_motion(int, int, unsigned) override;
+	bool key_press(unsigned, unsigned) override;
+	bool key_release(unsigned, unsigned) override;
+	bool character(wchar_t) override;
+	void focus_in() override;
+	void focus_out() override;
+	bool navigate(Navigation) override;
+	void animate(const Time::TimeDelta &) override;
 protected:
-	virtual void on_reparent();
+	void on_reparent() override;
 	virtual void on_child_added(Widget &) { }
 	virtual void on_child_removed(Widget &) { }
+	virtual void on_input_focus_changed(Widget *);
 };
 
 } // namespace GLtk