diff options
| author | Robin Gareus <robin@gareus.org> | 2016-04-15 18:38:11 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-04-15 18:38:11 +0200 |
| commit | a4f57e6b2fd7e2a08781ef62edc19c3f252c1562 (patch) | |
| tree | 46d65e0714dfe7ac60a7f8131702b5b5c6cb1e86 | |
| parent | 5242aeb871d173c80e0ecde567831c7afcbf0fac (diff) | |
re-order label z-stacking in Pin Dialog
| -rw-r--r-- | gtk2_ardour/plugin_pin_dialog.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/gtk2_ardour/plugin_pin_dialog.cc b/gtk2_ardour/plugin_pin_dialog.cc index 422cd802bb..d089890574 100644 --- a/gtk2_ardour/plugin_pin_dialog.cc +++ b/gtk2_ardour/plugin_pin_dialog.cc @@ -789,25 +789,6 @@ PluginPinDialog::darea_expose_event (GdkEventExpose* ev) cairo_set_source_rgb (cr, .3, .3, .3); cairo_fill (cr); - /* draw midi-bypass (behind) */ - if (_pi->has_midi_bypass ()) { - const CtrlWidget& cw0 = get_io_ctrl (Input, DataType::MIDI, 0); - const CtrlWidget& cw1 = get_io_ctrl (Output, DataType::MIDI, 0); - draw_connection (cr, cw0, cw1, true); - } - - /* thru connections */ - const ChanMapping::Mappings thru_map = _pi->thru_map ().mappings (); - for (ChanMapping::Mappings::const_iterator t = thru_map.begin (); t != thru_map.end (); ++t) { - for (ChanMapping::TypeMapping::const_iterator c = (*t).second.begin (); c != (*t).second.end () ; ++c) { - const CtrlWidget& cw0 = get_io_ctrl (Output, t->first, c->first); - const CtrlWidget& cw1 = get_io_ctrl (Input, t->first, c->second); - if (!(_dragging && cw1.e == _selection && cw0.e == _drag_dst)) { - draw_connection (cr, cw1, cw0, true); - } - } - } - /* labels */ Glib::RefPtr<Pango::Layout> layout; layout = Pango::Layout::create (get_pango_context ()); @@ -861,6 +842,25 @@ PluginPinDialog::darea_expose_event (GdkEventExpose* ev) pango_cairo_show_layout (cr, layout->gobj ()); } + /* draw midi-bypass (behind) */ + if (_pi->has_midi_bypass ()) { + const CtrlWidget& cw0 = get_io_ctrl (Input, DataType::MIDI, 0); + const CtrlWidget& cw1 = get_io_ctrl (Output, DataType::MIDI, 0); + draw_connection (cr, cw0, cw1, true); + } + + /* thru connections */ + const ChanMapping::Mappings thru_map = _pi->thru_map ().mappings (); + for (ChanMapping::Mappings::const_iterator t = thru_map.begin (); t != thru_map.end (); ++t) { + for (ChanMapping::TypeMapping::const_iterator c = (*t).second.begin (); c != (*t).second.end () ; ++c) { + const CtrlWidget& cw0 = get_io_ctrl (Output, t->first, c->first); + const CtrlWidget& cw1 = get_io_ctrl (Input, t->first, c->second); + if (!(_dragging && cw1.e == _selection && cw0.e == _drag_dst)) { + draw_connection (cr, cw1, cw0, true); + } + } + } + /* plugins & connection wires */ for (uint32_t i = 0; i < _n_plugins; ++i) { |