Refactor Panel to create Layout internally on request

[libs/gltk.git] / source / panel.cpp

diff --git a/source/panel.cpp b/source/panel.cpp
index 5c189e0003429b29835efd9a687b97ffe1eb9f06..56aa2dcb5545003fd3feb2975be9fd451bc029ac 100644 (file)
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -38,11 +38,15 @@ Panel::~Panel()
        layout = nullptr;
 }
 
-void Panel::set_layout(Layout *l)
+Layout &Panel::get_or_create_layout()
 {
-       l->set_container(*this);
-       delete layout;
-       layout = l;
+       if(!layout)
+       {
+               layout = new Layout;
+               layout->set_container(*this);
+       }
+
+       return *layout;
 }
 
 void Panel::autosize_special(const Part &part, Geometry &ageom) const
@@ -242,14 +246,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)
@@ -261,7 +257,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);
 }
@@ -270,34 +266,34 @@ 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(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);
 }