diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-03-02 20:59:13 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-03-02 20:59:13 +0000 |
| commit | 6eccd043f22d9ddfa6418c4342e0a9fd5476a7dd (patch) | |
| tree | e7c671e94b63ed713c34a88e8dc57ebf5d3cfd0e /gtk2_ardour/visual_time_axis.cc | |
| parent | a453d545080c5e8ec0cb54161ee826ad479d6d69 (diff) | |
ICS (image compositor socket) patches from robin gareus, to keep ICS alive in 2.X; variations on giso's proposed fix for #1731 (x-fade clicking)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4720 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/visual_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/visual_time_axis.cc | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc index 2035293cf8..468b967186 100644 --- a/gtk2_ardour/visual_time_axis.cc +++ b/gtk2_ardour/visual_time_axis.cc @@ -84,18 +84,22 @@ VisualTimeAxis::VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Se size_button.set_name("TrackSizeButton") ; visual_button.set_name("TrackVisualButton") ; hide_button.set_name("TrackRemoveButton") ; - hide_button.add(*(Gtk::manage(new Gtk::Image(get_xpm("small_x.xpm"))))); + hide_button.add (*(manage (new Image (::get_icon("hide"))))); + hide_button.show_all (); + size_button.signal_button_release_event().connect (mem_fun (*this, &VisualTimeAxis::size_click)) ; visual_button.signal_clicked().connect (mem_fun (*this, &VisualTimeAxis::visual_click)) ; hide_button.signal_clicked().connect (mem_fun (*this, &VisualTimeAxis::hide_click)) ; ARDOUR_UI::instance()->tooltips().set_tip(size_button,_("Display Height")) ; ARDOUR_UI::instance()->tooltips().set_tip(visual_button, _("Visual options")) ; ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("Hide this track")) ; - + +if (0) { + /* old school - when we used to put an extra row of buttons in place */ controls_table.attach (hide_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (visual_button, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (size_button, 2, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - +} /* remove focus from the buttons */ size_button.unset_flags(Gtk::CAN_FOCUS) ; hide_button.unset_flags(Gtk::CAN_FOCUS) ; @@ -154,15 +158,21 @@ VisualTimeAxis::set_height(uint32_t h) if (h >= hNormal) { hide_name_label (); show_name_entry (); - other_button_hbox.show_all() ; + visual_button.show(); + size_button.show(); + hide_button.show(); } else if (h >= hSmaller) { hide_name_label (); show_name_entry (); - other_button_hbox.hide_all() ; + visual_button.hide (); + size_button.hide (); + hide_button.hide(); } else if (h >= hSmall) { hide_name_entry (); show_name_label (); - other_button_hbox.hide_all() ; + visual_button.hide (); + size_button.hide (); + hide_button.hide (); } } |