mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::button_press), false));
mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::axis_motion), false));
root.signal_tooltip.connect(sigc::mem_fun(this, &Designer::tooltip));
+ root_layout = new GLtk::Layout;
+ root_layout->set_margin(0);
+ root.set_layout(root_layout);
toolbars.push_back(new Layoutbar(*this));
toolbars.push_back(new Trackbar(*this));
toolbars.push_back(new Routebar(*this));
toolbars.push_back(new Zonebar(*this));
+ Toolbar *prev = 0;
for(vector<Toolbar *>::iterator i=toolbars.begin(); i!=toolbars.end(); ++i)
{
root.add(**i);
if(i!=toolbars.begin())
(*i)->expand(false);
- (*i)->signal_expanded.connect(sigc::hide(sigc::mem_fun(this, &Designer::arrange_toolbars)));
+ (*i)->signal_expanded.connect(sigc::hide(sigc::mem_fun(root_layout, &GLtk::Layout::update)));
+ if(prev)
+ {
+ root_layout->add_constraint(**i, GLtk::Layout::RIGHT_OF, *prev, 0);
+ root_layout->add_constraint(**i, GLtk::Layout::COPY_HEIGHT, *prev);
+ }
+ prev = *i;
}
- arrange_toolbars();
GLtk::Panel *statusbar = new GLtk::Panel;
root.add(*statusbar);
- statusbar->set_size(window.get_width(), 20);
statusbar->set_focusable(false);
+ root_layout->set_gravity(*statusbar, -1, -1);
+ root_layout->set_expand(*statusbar, true, false);
lbl_status = new GLtk::Label;
statusbar->add(*lbl_status);
{
InputDialog *input = new InputDialog(*this, "Save layout", filename);
input->signal_accept.connect(sigc::mem_fun(layout, &Layout::save));
+ root.add(*input);
+ root_layout->set_gravity(*input, 0, 0);
}
void Designer::quit()
TrackProperties *track_prop = new TrackProperties(selection);
root.add(*track_prop);
- const GLtk::Geometry &root_geom = root.get_geometry();
- const GLtk::Geometry &dlg_geom = track_prop->get_geometry();
- track_prop->set_position((root_geom.w-dlg_geom.w)/2, (root_geom.h-dlg_geom.h)/2);
+ root_layout->set_gravity(*track_prop, 0, 0);
track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response));
}
{
InputDialog *input = new InputDialog(*this, "SVG export", FS::basepart(filename)+".svg");
input->signal_accept.connect(sigc::mem_fun(this, &Designer::svg_export_accept));
+ root.add(*input);
+ root_layout->set_gravity(*input, 0, 0);
}
void Designer::edit_route(Route *r)
InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name());
input->signal_accept.connect(sigc::mem_fun(this, &Designer::route_name_accept));
+ root.add(*input);
+ root_layout->set_gravity(*input, 0, 0);
}
void Designer::add_selection_to_route()
selection_changed();
}
-void Designer::arrange_toolbars()
-{
- unsigned x = 0;
- for(vector<Toolbar *>::iterator i=toolbars.begin(); i!=toolbars.end(); ++i)
- {
- const GLtk::Geometry &geom = (*i)->get_geometry();
- (*i)->set_position(x, window.get_height()-geom.h);
- x += geom.w;
- }
-}
-
void Designer::track_properties_response(int)
{
const set<Track *> &tracks = selection.get_objects<Track>();
string Designer::tooltip(int x, int y)
{
- if(Object *obj = pick_object(Vector(x*2.0f/window.get_width()-1.0f, y*2.0f/window.get_height()-1.0f, 0)))
+ const GLtk::Geometry &rgeom = root.get_geometry();
+ if(Object *obj = pick_object(Vector(x*2.0f/rgeom.w-1.0f, y*2.0f/rgeom.h-1.0f, 0)))
{
const ObjectType &otype = obj->get_type();
string info = format("%d %s", otype.get_article_number(), otype.get_description());
if(Track *track = dynamic_cast<Track *>(obj))
{
- const TrackType &ttype = track->get_type();
- if(mode!=CATALOGUE && abs(track->get_slope())>1e-4)
- info += format(" (slope %.1f%%)", abs(track->get_slope()/ttype.get_total_length()*100));
+ if(mode!=CATALOGUE && abs(track->get_tilt()).radians()>1e-4)
+ info += format(" (slope %.1f%%)", abs(tan(track->get_tilt())*100));
if(track->get_turnout_id())
info += format(" (turnout %d)", track->get_turnout_id());
else if(track->get_sensor_id())