X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=28e0e2feafff2105017c61bb35dda55656cf6d0e;hb=d605500ca2f4bf02968d963bd64e8d3ad05acbd1;hp=03dff1137bfdf6416f6d755c61bae65604f8733b;hpb=5bb0cc92a28a7862571249a2512bcd23ed272344;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index 03dff11..28e0e2f 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -18,7 +18,8 @@ Container::Container():
 	pointer_grabbed(false),
 	input_focus(0),
 	saved_input_focus(0),
-	touch_focus(0)
+	touch_focus(0),
+	children_rebuild_needed(false)
 { }
 
 Container::~Container()
@@ -33,6 +34,7 @@ void Container::add(Widget &wdg)
 	children.push_back(create_child(&wdg));
 	if(wdg.get_animation_interval())
 		check_animation_interval();
+	children_rebuild_needed = true;
 	on_child_added(wdg);
 }
 
@@ -130,7 +132,7 @@ void Container::raise(Widget &wdg)
 	throw hierarchy_error("widget not in container");
 }
 
-void Container::set_pointer_focus(Widget *wdg)
+void Container::set_pointer_focus(Widget *wdg, bool grab)
 {
 	if(wdg!=pointer_focus)
 	{
@@ -138,10 +140,13 @@ void Container::set_pointer_focus(Widget *wdg)
 			pointer_focus->pointer_leave();
 
 		pointer_focus = wdg;
+		pointer_grabbed = grab;
 
 		if(pointer_focus)
 			pointer_focus->pointer_enter();
 	}
+	else
+		pointer_grabbed = grab;
 }
 
 void Container::set_input_focus(Widget *wdg)
@@ -182,6 +187,18 @@ void Container::check_animation_interval()
 		set_animation_interval(shortest);
 }
 
+void Container::rebuild_hierarchy()
+{
+	Widget::rebuild_hierarchy();
+
+	if(children_rebuild_needed)
+	{
+		children_rebuild_needed = false;
+		for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
+			(*i)->widget->rebuild_hierarchy();
+	}
+}
+
 void Container::button_press(int x, int y, unsigned btn)
 {
 	if(Widget *child = get_pointer_target(x, y, false))
@@ -221,7 +238,7 @@ void Container::pointer_motion(int x, int y)
 {
 	Widget *child = get_pointer_target(x, y, false);
 	if(!pointer_grabbed)
-		set_pointer_focus((!click_focus || child->get_geometry().is_inside(x, y)) ? child : 0);
+		set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : 0);
 
 	if(child)
 	{
@@ -379,6 +396,7 @@ Container::Child::Child(Container &c, Widget *w):
 	widget->signal_grab_pointer.connect(sigc::mem_fun(this, &Child::grab_pointer));
 	widget->signal_ungrab_pointer.connect(sigc::mem_fun(this, &Child::ungrab_pointer));
 	widget->signal_request_animation.connect(sigc::mem_fun(this, &Child::request_animation));
+	widget->signal_rebuild_needed.connect(sigc::mem_fun(this, &Child::rebuild_needed));
 }
 
 Container::Child::~Child()
@@ -411,8 +429,7 @@ void Container::Child::grab_pointer()
 {
 	if(!container.pointer_grabbed)
 	{
-		container.set_pointer_focus(widget);
-		container.pointer_grabbed = true;
+		container.set_pointer_focus(widget, true);
 		container.signal_grab_pointer.emit();
 	}
 }
@@ -423,7 +440,6 @@ void Container::Child::ungrab_pointer()
 	{
 		// XXX Should set to the widget under pointer
 		container.set_pointer_focus(0);
-		container.pointer_grabbed = false;
 		container.signal_ungrab_pointer.emit();
 	}
 }
@@ -435,5 +451,11 @@ void Container::Child::request_animation(const Time::TimeDelta &interval)
 	container.check_animation_interval();
 }
 
+void Container::Child::rebuild_needed()
+{
+	container.children_rebuild_needed = true;
+	container.signal_rebuild_needed.emit();
+}
+
 } // namespace GLtk
 } // namespace Msp