add tearoff reattach for the editor

This commit is contained in:
Paul Davis 2014-10-16 13:43:07 -04:00
parent 8097b8c762
commit 8d8717800d
4 changed files with 11 additions and 0 deletions

View file

@ -484,6 +484,7 @@ void
ARDOUR_UI::reattach_all_tearoffs () ARDOUR_UI::reattach_all_tearoffs ()
{ {
if (transport_tearoff) transport_tearoff->put_it_back(); if (transport_tearoff) transport_tearoff->put_it_back();
if (editor) editor->reattach_all_tearoffs ();
} }
void void

View file

@ -4069,6 +4069,14 @@ Editor::update_tearoff_visibility()
} }
} }
void
Editor::reattach_all_tearoffs ()
{
if (_mouse_mode_tearoff) _mouse_mode_tearoff->put_it_back ();
if (_tools_tearoff) _tools_tearoff->put_it_back ();
if (_zoom_tearoff) _zoom_tearoff->put_it_back ();
}
void void
Editor::maximise_editing_space () Editor::maximise_editing_space ()
{ {

View file

@ -369,6 +369,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void restore_editing_space(); void restore_editing_space();
void update_tearoff_visibility(); void update_tearoff_visibility();
void reattach_all_tearoffs ();
void reset_x_origin (framepos_t); void reset_x_origin (framepos_t);
void reset_x_origin_to_follow_playhead (); void reset_x_origin_to_follow_playhead ();

View file

@ -290,6 +290,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
virtual void maximise_editing_space () = 0; virtual void maximise_editing_space () = 0;
virtual void restore_editing_space () = 0; virtual void restore_editing_space () = 0;
virtual void update_tearoff_visibility () = 0; virtual void update_tearoff_visibility () = 0;
virtual void reattach_all_tearoffs () = 0;
virtual framepos_t get_preferred_edit_position (bool ignore_playhead = false, bool from_context_menu = false) = 0; virtual framepos_t get_preferred_edit_position (bool ignore_playhead = false, bool from_context_menu = false) = 0;
virtual void toggle_meter_updating() = 0; virtual void toggle_meter_updating() = 0;
virtual void split_regions_at (framepos_t, RegionSelection&) = 0; virtual void split_regions_at (framepos_t, RegionSelection&) = 0;