pointer_focus(0),
pointer_grabbed(false),
input_focus(0),
- touch_focus(0)
+ saved_input_focus(0),
+ touch_focus(0),
+ children_rebuild_needed(false)
{ }
Container::~Container()
children.push_back(create_child(&wdg));
if(wdg.get_animation_interval())
check_animation_interval();
+ children_rebuild_needed = true;
+ signal_rebuild_needed.emit();
on_child_added(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)
{
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)
input_focus->focus_out();
input_focus = wdg;
+ on_input_focus_changed(input_focus);
if(input_focus)
- {
- raise(*wdg);
input_focus->focus_in();
- }
}
}
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))
{
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)
{
return false;
}
+void Container::focus_in()
+{
+ if(saved_input_focus && saved_input_focus->get_parent()==this)
+ set_input_focus(saved_input_focus);
+ Widget::focus_in();
+}
+
void Container::focus_out()
{
+ saved_input_focus = input_focus;
set_input_focus(0);
Widget::focus_out();
}
}
}
+void Container::on_input_focus_changed(Widget *wdg)
+{
+ if(wdg)
+ raise(*wdg);
+}
+
Container::Child::Child(Container &c, Widget *w):
container(c),
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()
void Container::Child::request_focus()
{
- container.set_input_focus(widget);
if(container.parent && container.visible)
container.set_focus();
+ if(container.state&FOCUS)
+ container.set_input_focus(widget);
}
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();
}
}
{
// XXX Should set to the widget under pointer
container.set_pointer_focus(0);
- container.pointer_grabbed = false;
container.signal_ungrab_pointer.emit();
}
}
container.check_animation_interval();
}
+void Container::Child::rebuild_needed()
+{
+ container.children_rebuild_needed = true;
+ container.signal_rebuild_needed.emit();
+}
+
} // namespace GLtk
} // namespace Msp