diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-10-13 01:56:42 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-10-13 01:56:42 +0000 |
| commit | 2f4a7917de6c6c72f388ce7a79052d3a0cc400a2 (patch) | |
| tree | 42a7583603f81bd302a1e1fe3aa9d1e93c521c0e /gtk2_ardour/port_matrix.cc | |
| parent | 2c4a08bc5752d1453248af564ca3303c2c6e341c (diff) | |
Fit tracks fix from 2.0, don't crash if some env vars aren't set, remove some conflicts from mnemonic-us.bindings.in.
git-svn-id: svn://localhost/ardour2/branches/3.0@3943 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/port_matrix.cc')
| -rw-r--r-- | gtk2_ardour/port_matrix.cc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index 6ac7707002..cff4a3328e 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -252,7 +252,11 @@ RotatedLabelSet::RotatedLabelSet (PortGroupList& g) : Glib::ObjectBase ("RotatedLabelSet"), Widget (), _port_group_list (g), _base_width (128) { set_flags (NO_WINDOW); - set_angle (atoi (getenv ("AD_ANGLE"))); + if (getenv ("AD_ANGLE") != 0) { + set_angle (atoi (getenv ("AD_ANGLE"))); + } else { + set_angle (45); + } } RotatedLabelSet::~RotatedLabelSet () @@ -415,8 +419,17 @@ RotatedLabelSet::on_expose_event (GdkEventExpose* event) if ((*i)->visible) { for (uint32_t j = 0; j < (*i)->ports.size(); ++j) { std::pair<int, int> const d = setup_layout ((*i)->ports[j]); - int x = atoi (getenv ("AD_X_SHIFT")); - int y = atoi (getenv ("AD_Y_SHIFT")); + int x, y; + if (getenv ("AD_X_SHIFT") != 0) { + x = atoi (getenv ("AD_X_SHIFT")); + } else { + x = 0; + } + if (getenv ("AD_Y_SHIFT") != 0) { + y = atoi (getenv ("AD_Y_SHIFT")); + } else { + y = 0; + } get_window()->draw_layout (_gc, int ((n + 0.25) * spacing) + x, height - d.second + y, _pango_layout, _fg_colour, _bg_colour); ++n; } |