X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=ba66c682e85decb9608c084caeaaa6b5763c0318;hb=HEAD;hp=957385e0dbb82ae14c586e045a9c5ac1e0aa7cad;hpb=6deafc9f236b90175a303944815f7c0eac1c95c1;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 957385e..ba66c68 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -1,6 +1,5 @@
 #include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
-#include <msp/core/refptr.h>
 #include "button.h"
 #include "column.h"
 #include "draghandle.h"
@@ -27,23 +26,20 @@ namespace GLtk {
 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;
 }
 
-Panel::~Panel()
+Layout &Panel::get_or_create_layout()
 {
-	delete layout;
-	layout = 0;
-}
+	if(!layout)
+	{
+		layout = make_unique<Layout>();
+		layout->set_container(*this);
+	}
 
-void Panel::set_layout(Layout *l)
-{
-	l->set_container(*this);
-	delete layout;
-	layout = l;
+	return *layout;
 }
 
 void Panel::autosize_special(const Part &part, Geometry &ageom) const
@@ -56,9 +52,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 unique_ptr<Child> &c: children)
+			if(c->widget->is_visible())
+				c->widget->render(renderer);
 	}
 }
 
@@ -109,7 +105,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)
 		{
@@ -135,14 +131,14 @@ bool Panel::navigate(Navigation nav)
 
 Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int nav_x, int nav_y) const
 {
-	Widget *sibling = 0;
+	Widget *sibling = nullptr;
 	int best_score = 0;
-	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+	for(const unique_ptr<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 +150,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 +192,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());
 
@@ -211,7 +207,7 @@ void Panel::on_child_removed(Widget &wdg)
 Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	DataFile::DerivedObjectLoader<Panel, Widget::Loader>(p),
 	wdg_map(m),
-	last_widget(0)
+	last_widget(nullptr)
 {
 	if(!widget_registry_init_done)
 	{
@@ -243,14 +239,6 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	widget_registry.invoke_all(*this);
 }
 
-Layout &Panel::Loader::get_layout()
-{
-	if(!obj.layout)
-		obj.set_layout(new Layout);
-
-	return *obj.layout;
-}
-
 Widget &Panel::Loader::get_last_widget()
 {
 	if(!last_widget)
@@ -262,7 +250,7 @@ Widget &Panel::Loader::get_last_widget()
 template<typename T>
 void Panel::Loader::arrangement()
 {
-	T arr(get_layout());
+	T arr(obj.get_or_create_layout());
 	ArrangedLoader<T> ldr(*this, arr);
 	load_sub_with(ldr);
 }
@@ -271,44 +259,45 @@ void Panel::Loader::constraint(Layout::ConstraintType type, const string &n)
 {
 	Widget &src = get_last_widget();
 	Widget &tgt = *get_item(wdg_map, n);
-	get_layout().add_constraint(src, type, tgt);
+	obj.get_or_create_layout().add_constraint(src, type, tgt);
 }
 
 void Panel::Loader::expand(bool h, bool v)
 {
-	get_layout().set_expand(get_last_widget(), h, v);
+	obj.get_or_create_layout().set_expand(get_last_widget(), h, v);
 }
 
 void Panel::Loader::ghost(bool g)
 {
-	get_layout().set_ghost(get_last_widget(), g);
+	obj.get_or_create_layout().set_ghost(get_last_widget(), g);
 }
 
 void Panel::Loader::gravity(int h, int v)
 {
-	get_layout().set_gravity(get_last_widget(), h, v);
+	obj.get_or_create_layout().set_gravity(get_last_widget(), h, v);
 }
 
-void Panel::Loader::grid(unsigned cols)
+void Panel::Loader::grid(size_t cols)
 {
-	Grid grd(get_layout(), cols);
+	Grid grd(obj.get_or_create_layout(), cols);
 	ArrangedLoader<Grid> ldr(*this, grd);
 	load_sub_with(ldr);
 }
 
 void Panel::Loader::layout()
 {
-	Layout::Loader ldr(get_layout(), wdg_map);
+	Layout::Loader ldr(obj.get_or_create_layout(), wdg_map);
 	load_sub_with(ldr);
 }
 
 template<>
 void Panel::Loader::unnamed_child<Panel>()
 {
-	RefPtr<Panel> pnl = new Panel();
+	unique_ptr<Panel> pnl = make_unique<Panel>();
 	load_sub(*pnl, wdg_map);
-	obj.add(*pnl.get());
-	last_widget = pnl.release();
+	Widget *wdg = pnl.get();
+	obj.add(move(pnl));
+	last_widget = wdg;
 }