Arrange widgets in Designer with GLtk::Layout

[r2c2.git] / source / designer / input.cpp

diff --git a/source/designer/input.cpp b/source/designer/input.cpp
index ea4129a9cab1948a9383857ad277aefdcb5bd7fa..18b14a573bcad9754407c00525abc482b468c37e 100644 (file)
--- a/source/designer/input.cpp
+++ b/source/designer/input.cpp
@@ -1,6 +1,7 @@
 #include <GL/gl.h>
 #include <msp/gl/texture.h>
 #include <msp/gltk/button.h>
+#include <msp/gltk/mixedrows.h>
 #include <msp/input/keys.h>
 #include "designer.h"
 #include "input.h"
@@ -11,28 +12,28 @@ using namespace Msp;
 InputDialog::InputDialog(Designer &d, const string &title, const string &text):
        designer(d)
 {
-       set_size(300, 100);
+       GLtk::MixedRows *rows = new GLtk::MixedRows;
+       set_layout(rows);
 
        GLtk::Label *lbl;
        add(*(lbl=new GLtk::Label(title)));
-       lbl->set_geometry(GLtk::Geometry(10, geom.h-30, geom.w-20, 20));
+       layout->set_expand(*lbl, true, false);
+       lbl->set_style("title");
 
+       rows->start_row();
        add(*(entry=new GLtk::Entry(text)));
-       entry->set_geometry(GLtk::Geometry(10, geom.h-60, geom.w-20, 20));
+       entry->set_edit_size(60, 1);
 
        GLtk::Button *btn;
 
+       rows->start_row();
+       rows->split_columns();
        add_button(*(btn=new GLtk::Button("Cncl")), 0);
-       btn->set_geometry(GLtk::Geometry(geom.w-90, 10, 40, 24));
        btn->set_style("red");
 
        add_button(*(btn=new GLtk::Button("OK")), 1);
-       btn->set_geometry(GLtk::Geometry(geom.w-50, 10, 40, 24));
        btn->set_style("green");
 
-       designer.get_root().add(*this);
-       const GLtk::Geometry &rgeom=designer.get_root().get_geometry();
-       set_position((rgeom.w-geom.w)/2, (rgeom.h-geom.h)/2);
        entry->set_focus();
 }