X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=871d7a2d9ebffb211d1bdc3f389a4fd6374e31e6;hb=9f38197854e699a6093a906ab43f4238f3cd2388;hp=c97cd6d7212da9c648cbed683edf23dad4250701;hpb=7286d604956ddffcbfa2df6567de866f3d5df3a2;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index c97cd6d..871d7a2 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -7,28 +7,27 @@
 #include "dropdown.h"
 #include "entry.h"
 #include "grid.h"
-#include "hslider.h"
 #include "image.h"
 #include "indicator.h"
 #include "label.h"
 #include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "progressbar.h"
 #include "row.h"
+#include "slider.h"
 #include "stack.h"
 #include "toggle.h"
-#include "vslider.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GLtk {
 
-DataFile::LoadableTypeRegistry<Panel::Loader, Panel::Loader::AddChildType> Panel::widget_registry;
+TypeRegistry<Panel::Loader::AddChildType, Panel::Loader &> Panel::widget_registry;
 bool Panel::widget_registry_init_done = false;
 
-Panel::Panel():
-	layout(0)
+Panel::Panel()
 {
 	input_type = INPUT_NAVIGATION;
 }
@@ -56,9 +55,9 @@ void Panel::render_special(const Part &part, GL::Renderer &renderer) 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(renderer);
+		for(const Container::Child *c: children)
+			if(c->widget->is_visible())
+				c->widget->render(renderer);
 	}
 }
 
@@ -109,7 +108,7 @@ bool Panel::navigate(Navigation nav)
 	}
 	else if(nav==NAV_NEXT || nav==NAV_PREVIOUS)
 	{
-		vector<Widget *>::iterator i = find(nav_order, input_focus);
+		auto i = find(nav_order, input_focus);
 
 		if(nav==NAV_NEXT)
 		{
@@ -137,12 +136,12 @@ Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int n
 {
 	Widget *sibling = 0;
 	int best_score = 0;
-	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+	for(const Child *c: children)
 	{
-		if((*i)->widget==input_focus || !(*i)->widget->is_focusable())
+		if(c->widget==input_focus || !c->widget->is_focusable())
 			continue;
 
-		const Geometry &cgeom = (*i)->widget->get_geometry();
+		const Geometry &cgeom = c->widget->get_geometry();
 		int dx = compute_delta(cgeom.x, cgeom.w, origin_x, origin_dim, nav_x);
 		int dy = compute_delta(cgeom.y, cgeom.h, origin_y, origin_dim, nav_y);
 
@@ -154,7 +153,7 @@ Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int n
 
 		if(score>=0 && (!sibling || score<best_score))
 		{
-			sibling = (*i)->widget;
+			sibling = c->widget;
 			best_score = score;
 		}
 	}
@@ -196,7 +195,7 @@ void Panel::on_child_added(Widget &wdg)
 
 void Panel::on_child_removed(Widget &wdg)
 {
-	vector<Widget *>::iterator i = std::remove(nav_order.begin(), nav_order.end(), &wdg);
+	auto i = std::remove(nav_order.begin(), nav_order.end(), &wdg);
 	if(i!=nav_order.end())
 		nav_order.erase(i, nav_order.end());
 
@@ -226,6 +225,7 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 		register_child_type<Label>("label");
 		register_child_type<List>("list");
 		register_child_type<Panel>("panel");
+		register_child_type<ProgressBar>("progressbar");
 		register_child_type<Toggle>("toggle");
 		register_child_type<VSlider>("vslider");
 	}
@@ -239,7 +239,7 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	add("layout",    &Loader::layout);
 	add("row",       &Loader::arrangement<Row>);
 	add("stack",     &Loader::arrangement<Stack>);
-	widget_registry.add_all(*this);
+	widget_registry.invoke_all(*this);
 }
 
 Layout &Panel::Loader::get_layout()