X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=0ecdf1077ca0a7ae05abaa957dad2fb327493c5c;hb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;hp=14e9b6ea8cc3dbf97b9c57f4f673df53870bacc2;hpb=8a0058b5b90bb7e9eacf1646142f4d73b426fd66;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 14e9b6e..0ecdf10 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -25,14 +25,15 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Panel::Panel(const Resources &r):
-	Widget(r),
-	Container(r),
+Panel::Panel():
 	pointer_focus(0),
 	pointer_grabbed(false),
 	input_focus(0)
+{ }
+
+Panel::Child *Panel::create_child(Widget *wdg)
 {
-	update_style();
+	return new Child(*this, wdg);
 }
 
 void Panel::raise(Widget &wdg)
@@ -47,19 +48,41 @@ void Panel::raise(Widget &wdg)
 	throw InvalidState("That Widget is not in this Panel");
 }
 
+Widget *Panel::get_final_input_focus() const
+{
+	if(Panel *panel = dynamic_cast<Panel *>(input_focus))
+	{
+		Widget *focus = panel->get_final_input_focus();
+		if(focus)
+			return focus;
+	}
+	return input_focus;
+}
+
+void Panel::render_special(const Part &part) const
+{
+	if(part.get_name()=="children")
+	{
+		for(list<Container::Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+			if((*i)->widget->is_visible())
+				(*i)->widget->render();
+	}
+}
+
 void Panel::button_press(int x, int y, unsigned btn)
 {
 	if(pointer_grabbed)
 	{
-		const Geometry &cgeom=pointer_focus->get_geometry();
+		const Geometry &cgeom = pointer_focus->get_geometry();
 		pointer_focus->button_press(x-cgeom.x, y-cgeom.y, btn);
 	}
 	else
 	{
-		if(Widget *wdg=get_child_at(x, y))
+		if(Widget *wdg = get_child_at(x, y))
 		{
 			set_pointer_focus(wdg);
-			set_input_focus(wdg);
+			if(wdg->is_focusable())
+				set_input_focus(wdg);
 		}
 		Container::button_press(x, y, btn);
 	}
@@ -69,7 +92,7 @@ void Panel::button_release(int x, int y, unsigned btn)
 {
 	if(pointer_grabbed)
 	{
-		const Geometry &cgeom=pointer_focus->get_geometry();
+		const Geometry &cgeom = pointer_focus->get_geometry();
 		pointer_focus->button_release(x-cgeom.x, y-cgeom.y, btn);
 	}
 	else
@@ -80,7 +103,7 @@ void Panel::pointer_motion(int x, int y)
 {
 	if(pointer_grabbed)
 	{
-		const Geometry &cgeom=pointer_focus->get_geometry();
+		const Geometry &cgeom = pointer_focus->get_geometry();
 		pointer_focus->pointer_motion(x-cgeom.x, y-cgeom.y);
 	}
 	else
@@ -113,21 +136,6 @@ void Panel::focus_out()
 	set_input_focus(0);
 }
 
-void Panel::render_special(const Part &part) const
-{
-	if(part.get_name()=="children")
-	{
-		for(list<Container::Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-			if((*i)->widget->is_visible())
-				(*i)->widget->render();
-	}
-}
-
-Panel::Child *Panel::create_child(Widget *wdg)
-{
-	return new Child(*this, wdg);
-}
-
 void Panel::set_pointer_focus(Widget *wdg)
 {
 	if(wdg!=pointer_focus)
@@ -135,7 +143,7 @@ void Panel::set_pointer_focus(Widget *wdg)
 		if(pointer_focus)
 			pointer_focus->pointer_leave();
 
-		pointer_focus=wdg;
+		pointer_focus = wdg;
 
 		if(pointer_focus)
 			pointer_focus->pointer_enter();
@@ -149,7 +157,7 @@ void Panel::set_input_focus(Widget *wdg)
 		if(input_focus)
 			input_focus->focus_out();
 
-		input_focus=wdg;
+		input_focus = wdg;
 
 		if(input_focus)
 		{
@@ -181,18 +189,18 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 template<typename T>
 void Panel::Loader::child(const string &n)
 {
-	RefPtr<T> chl=new T(pnl.res);
+	RefPtr<T> chl = new T();
 	load_sub(*chl);
 	pnl.add(*chl.get());
-	wdg_map[n]=chl.release();
+	wdg_map[n] = chl.release();
 }
 
 void Panel::Loader::panel(const string &n)
 {
-	RefPtr<Panel> p=new Panel(pnl.res);
+	RefPtr<Panel> p = new Panel();
 	load_sub(*p, wdg_map);
 	pnl.add(*p.get());
-	wdg_map[n]=p.release();
+	wdg_map[n] = p.release();
 }
 
 
@@ -214,7 +222,7 @@ void Panel::Child::visibility_changed(bool v)
 {
 	if(!v)
 	{
-		Panel &panel=static_cast<Panel &>(container);
+		Panel &panel = static_cast<Panel &>(container);
 		if(widget==panel.pointer_focus)
 			panel.set_pointer_focus(0);
 		if(widget==panel.input_focus)
@@ -224,28 +232,31 @@ void Panel::Child::visibility_changed(bool v)
 
 void Panel::Child::request_focus()
 {
-	static_cast<Panel &>(container).set_input_focus(widget);
+	Panel &panel = static_cast<Panel &>(container);
+	panel.set_input_focus(widget);
+	if(panel.parent && panel.visible)
+		panel.set_focus();
 }
 
 void Panel::Child::grab_pointer()
 {
-	Panel &panel=static_cast<Panel &>(container);
+	Panel &panel = static_cast<Panel &>(container);
 	if(!panel.pointer_grabbed)
 	{
 		panel.set_pointer_focus(widget);
-		panel.pointer_grabbed=true;
+		panel.pointer_grabbed = true;
 		panel.signal_grab_pointer.emit();
 	}
 }
 
 void Panel::Child::ungrab_pointer()
 {
-	Panel &panel=static_cast<Panel &>(container);
+	Panel &panel = static_cast<Panel &>(container);
 	if(panel.pointer_grabbed && panel.pointer_focus==widget)
 	{
 		// XXX Should set to the widget under pointer
 		panel.set_pointer_focus(0);
-		panel.pointer_grabbed=false;
+		panel.pointer_grabbed = false;
 		panel.signal_ungrab_pointer.emit();
 	}
 }