X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=389e3d9be729485fc4c16db0ee4dca3237a5f3ed;hb=1021ce203ab092edf5f94770e742d56a3b8cd23b;hp=efe857ec6860be568acc50b4e37134cd2f85ec44;hpb=b23464cda4e4f2c7b69b18549f18c2c893c3fe2d;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index efe857e..389e3d9 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -1,172 +1,113 @@
+#include <algorithm>
 #include <msp/core/refptr.h>
+#include "button.h"
+#include "dropdown.h"
+#include "entry.h"
+#include "hslider.h"
+#include "indicator.h"
 #include "label.h"
+#include "layout.h"
+#include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "toggle.h"
+#include "vslider.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GLtk {
 
-Panel::Panel(const Resources &r):
-	Widget(r),
-	pointer_focus(0),
-	pointer_grab(0),
-	input_focus(0)
-{
-	update_style();
-}
+Panel::Panel():
+	layout(0)
+{ }
 
 Panel::~Panel()
 {
-	for(ChildSeq::iterator i=children.begin(); i!=children.end(); ++i)
-		delete *i;
+	delete layout;
+	layout = 0;
 }
 
-void Panel::button_press(int x, int y, unsigned btn)
+void Panel::set_layout(Layout *l)
 {
-	if(pointer_grab>0)
-		pointer_focus->button_press(x-geom.x, y-geom.y, btn);
-	else if(geom.is_inside(x, y))
-	{
-		if(Widget *wdg=get_child_at(x, y))
-		{
-			wdg->button_press(x-geom.x, y-geom.y, btn);
-			pointer_grab=btn;
-			set_input_focus(wdg);
-		}
-	}
+	l->set_container(*this);
+	delete layout;
+	layout = l;
 }
 
-void Panel::button_release(int x, int y, unsigned btn)
+void Panel::autosize()
 {
-	if(pointer_grab>0)
-	{
-		pointer_focus->button_release(x-geom.x, y-geom.y, btn);
-
-		if(btn==pointer_grab)
-		{
-			pointer_grab=0;
-
-			set_pointer_focus(get_child_at(x, y));
-		}
-	}
-	else if(geom.is_inside(x, y))
-	{
-		if(Widget *wdg=get_child_at(x, y))
-			wdg->button_release(x-geom.x, y-geom.y, btn);
-	}
+	if(layout)
+		layout->autosize();
 }
 
-void Panel::pointer_motion(int x, int y)
+void Panel::render_special(const Part &part, GL::Renderer &renderer) const
 {
-	if(pointer_grab>0)
-		pointer_focus->pointer_motion(x-geom.x, y-geom.y);
-	else if(geom.is_inside(x, y))
+	if(part.get_name()=="children")
 	{
-		Widget *wdg=get_child_at(x, y);
-		set_pointer_focus(wdg);
-		if(wdg)
-			wdg->pointer_motion(x-geom.x, y-geom.y);
+		for(list<Container::Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+			if((*i)->widget->is_visible())
+				(*i)->widget->render(renderer);
 	}
 }
 
-void Panel::key_press(unsigned key, unsigned mod, wchar_t ch)
-{
-	if(input_focus)
-		input_focus->key_press(key, mod, ch);
-}
-
-void Panel::key_release(unsigned key, unsigned mod)
-{
-	if(input_focus)
-		input_focus->key_release(key, mod);
-}
-
-void Panel::focus_out()
+void Panel::on_geometry_change()
 {
-	set_input_focus(0);
+	if(layout)
+		layout->update();
 }
 
-void Panel::add(Widget &wdg)
+void Panel::on_child_added(Widget &wdg)
 {
-	children.push_back(&wdg);
-}
-
-void Panel::render_part(const Part &part) const
-{
-	if(part.get_name()=="children")
+	if(layout)
 	{
-		for(ChildSeq::const_iterator i=children.begin(); i!=children.end(); ++i)
-			if((*i)->is_visible())
-				(*i)->render();
+		layout->add_widget(wdg);
+		signal_autosize_changed.emit();
 	}
-	else
-		Widget::render_part(part);
 }
 
-void Panel::set_pointer_focus(Widget *wdg)
+void Panel::on_child_removed(Widget &wdg)
 {
-	if(wdg!=pointer_focus && pointer_grab==0)
+	if(layout)
 	{
-		if(pointer_focus)
-			pointer_focus->pointer_leave();
-
-		pointer_focus=wdg;
-
-		if(pointer_focus)
-			pointer_focus->pointer_enter();
+		layout->remove_widget(wdg);
+		signal_autosize_changed.emit();
 	}
 }
 
-void Panel::set_input_focus(Widget *wdg)
-{
-	if(wdg!=input_focus)
-	{
-		if(input_focus)
-			input_focus->focus_out();
-
-		input_focus=wdg;
-
-		if(input_focus)
-			input_focus->focus_in();
-	}
-}
-
-Widget *Panel::get_child_at(int x, int y)
-{
-	for(ChildSeq::reverse_iterator i=children.rbegin(); i!=children.rend(); ++i)
-		if((*i)->is_visible() && (*i)->get_geometry().is_inside(x-geom.x, y-geom.y))
-			return *i;
-
-	return 0;
-}
-
 
 Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	Widget::Loader(p),
 	pnl(p),
 	wdg_map(m)
 {
-	add("label", &Loader::child<Label>);
-	add("panel", &Loader::panel);
+	add("button",    &Loader::child<Button>);
+	add("dropdown",  &Loader::child<Dropdown>);
+	add("entry",     &Loader::child<Entry>);
+	add("hslider",   &Loader::child<HSlider>);
+	add("indicator", &Loader::child<Indicator>);
+	add("label",     &Loader::child<Label>);
+	add("list",      &Loader::child<List>);
+	add("panel",     &Loader::panel);
+	add("toggle",    &Loader::child<Toggle>);
+	add("vslider",   &Loader::child<VSlider>);
 }
 
 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();
 }
 
 } // namespace GLtk