rework dialog-close-focus-reset change to work in Tabbed
[ardour.git] / gtk2_ardour / ardour_ui2.cc
index 2e86fc703b404334eff77769e6810b085448fb64..4d05bca0d8d28a6c7ebdc9a74abb51d341f54a33 100644 (file)
@@ -36,7 +36,6 @@
 #include "gtkmm2ext/cairocell.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/click_box.h"
-#include "gtkmm2ext/tearoff.h"
 #include "gtkmm2ext/window_title.h"
 
 #include "ardour/profile.h"
@@ -69,67 +68,6 @@ using namespace Glib;
 using namespace ARDOUR_UI_UTILS;
 
 
-bool
-ARDOUR_UI::tabs_button_event (GdkEventButton* ev)
-{
-       std::vector<Widget*> children = _tabs.get_children();
-
-       for (std::vector<Widget*>::iterator w = children.begin(); w != children.end(); ++w) {
-
-               Gtk::Widget* close_button = reinterpret_cast<Gtk::Widget*> ((*w)->get_data ("close-button"));
-
-               if (close_button) {
-
-                       Gtk::Allocation alloc (close_button->get_allocation());
-                       int dx, dy;
-
-                       /* Allocation origin uses toplevel window coordinates;
-                        * event origin uses _tabs-centric coordinate space, so
-                        * translate before computing if event is inside the
-                        * close button.
-                        */
-                       
-                       close_button->get_toplevel()->translate_coordinates (_tabs, alloc.get_x(), alloc.get_y(), dx, dy);
-                       
-                       if (ev->x >= dx &&
-                           ev->y >= dy &&
-                           ev->x < dx + alloc.get_width() &&
-                           ev->y < dy + alloc.get_height()) {
-                               if (close_button->event ((GdkEvent*) ev)) {
-                                       return true;
-                               }
-                       }
-               }
-       }
-       
-       return false;
-}
-
-void
-ARDOUR_UI::tabs_page_removed (Gtk::Widget*, guint)
-{
-       if (_tabs.get_n_pages() == 1) {
-               _tabs.set_show_tabs (false);
-       } else {
-               _tabs.set_show_tabs (true);
-       }
-}
-
-void
-ARDOUR_UI::tabs_page_added (Gtk::Widget*, guint)
-{
-       if (_tabs.get_n_pages() == 1) {
-               _tabs.set_show_tabs (false);
-       } else {
-               _tabs.set_show_tabs (true);
-       }
-}
-
-void
-ARDOUR_UI::tabs_switch (GtkNotebookPage*, guint page_number)
-{
-}
-
 void
 ARDOUR_UI::setup_tooltips ()
 {
@@ -231,18 +169,8 @@ ARDOUR_UI::setup_transport ()
 {
        RefPtr<Action> act;
 
-       transport_tearoff_hbox.set_border_width (PX_SCALE(3));
-       transport_tearoff_hbox.set_spacing (PX_SCALE(3));
-
-       transport_tearoff = manage (new TearOff (transport_tearoff_hbox));
-       transport_tearoff->set_name ("TransportBase");
-       transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false);
-
-       if (Profile->get_sae() || Profile->get_mixbus()) {
-               transport_tearoff->set_can_be_torn_off (false);
-       }
-
-       transport_hbox.pack_start (*transport_tearoff, true, false);
+       transport_hbox.set_border_width (PX_SCALE(3));
+       transport_hbox.set_spacing (PX_SCALE(3));
 
        transport_base.set_name ("TransportBase");
        transport_base.add (transport_hbox);
@@ -251,15 +179,6 @@ ARDOUR_UI::setup_transport ()
        transport_frame.set_name ("BaseFrame");
        transport_frame.add (transport_base);
 
-       transport_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
-                                                static_cast<Widget*>(&transport_frame)));
-       transport_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
-                                                static_cast<Widget*> (&transport_frame), 1));
-       transport_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
-                                                static_cast<Widget*>(&transport_frame)));
-       transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
-                                                 static_cast<Widget*> (&transport_frame), 1));
-
        auto_return_button.set_text(_("Auto Return"));
 
        follow_edits_button.set_text(_("Follow Edits"));
@@ -433,11 +352,7 @@ ARDOUR_UI::setup_transport ()
 
        time_info_box = manage (new TimeInfoBox);
 
-       if (ARDOUR::Profile->get_trx()) {
-               transport_tearoff_hbox.pack_start (*time_info_box, false, false);
-       }
-
-       transport_tearoff_hbox.pack_start (*transport_vbox, false, false);
+       transport_hbox.pack_start (*transport_vbox, false, true);
 
        /* transport related toggle controls */
 
@@ -451,60 +366,30 @@ ARDOUR_UI::setup_transport ()
        }
 
        if (!ARDOUR::Profile->get_trx()) {
-               transport_tearoff_hbox.pack_start (*auto_box, false, false);
+               transport_hbox.pack_start (*auto_box, false, false);
        }
-       transport_tearoff_hbox.pack_start (*clock_box, true, true);
+       transport_hbox.pack_start (*clock_box, true, true);
 
        if (ARDOUR::Profile->get_trx()) {
-               transport_tearoff_hbox.pack_start (*auto_box, false, false);
+               transport_hbox.pack_start (*auto_box, false, false);
        }
 
        if (!ARDOUR::Profile->get_trx()) {
-               transport_tearoff_hbox.pack_start (*time_info_box, false, false);
+               transport_hbox.pack_start (*time_info_box, false, false);
        }
 
        if (!ARDOUR::Profile->get_trx()) {
-               transport_tearoff_hbox.pack_start (alert_box, false, false);
-               transport_tearoff_hbox.pack_start (meter_box, false, false);
-               transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
-       }
-
-       if (Profile->get_sae()) {
-               Image* img = manage (new Image ((::get_icon (X_("sae")))));
-               transport_tearoff_hbox.pack_end (*img, false, false);
+               transport_hbox.pack_start (alert_box, false, false);
+               transport_hbox.pack_start (meter_box, false, false);
+               transport_hbox.pack_start (editor_meter_peak_display, false, false);
        }
 
        /* desensitize */
 
        set_transport_sensitivity (false);
-
-       XMLNode* tnode = tearoff_settings ("transport");
-       if (tnode) {
-               transport_tearoff->set_state (*tnode);
-       }
 }
 #undef PX_SCALE
 
-void
-ARDOUR_UI::detach_tearoff (Box* b, Widget* w)
-{
-       b->remove (*w);
-}
-
-void
-ARDOUR_UI::reattach_tearoff (Box* b, Widget* w, int32_t n)
-{
-       b->pack_start (*w);
-       b->reorder_child (*w, n);
-}
-
-void
-ARDOUR_UI::reattach_all_tearoffs ()
-{
-       if (transport_tearoff) transport_tearoff->put_it_back();
-       if (editor) editor->reattach_all_tearoffs ();
-}
-
 void
 ARDOUR_UI::soloing_changed (bool onoff)
 {
@@ -676,14 +561,6 @@ ARDOUR_UI::editor_realized ()
        UIConfiguration::instance().reset_dpi ();
 }
 
-void
-ARDOUR_UI::update_tearoff_visibility ()
-{
-       if (editor) {
-               editor->update_tearoff_visibility ();
-       }
-}
-
 void
 ARDOUR_UI::maximise_editing_space ()
 {