hans' patches for MIDI note resizing++

[ardour.git] / gtk2_ardour / location_ui.cc

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index b9dea243134ddaaea1c95ca975a629be8344bb5d..2079d0dc7a722de5c966964a2cb0607272768987 100644 (file)
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -222,7 +222,7 @@ LocationEditRow::set_location (Location *loc)
                name_label.set_size_request (80, -1);
 
                if (!name_label.get_parent()) {
-                       item_table.attach (name_label, 1, 2, 0, 1, FILL, Gtk::FILL, 4, 0);
+                       item_table.attach (name_label, 1, 2, 0, 1, FILL, FILL, 4, 0);
                }
                
                name_label.show();
@@ -240,10 +240,10 @@ LocationEditRow::set_location (Location *loc)
                name_entry.show();
 
                if (!cd_check_button.get_parent()) {
-                       item_table.attach (cd_check_button, 5, 6, 0, 1, FILL, Gtk::FILL, 4, 0);
+                       item_table.attach (cd_check_button, 5, 6, 0, 1, FILL, FILL, 4, 0);
                }
                if (!remove_button.get_parent()) {
-                       item_table.attach (remove_button, 7, 8, 0, 1, FILL, Gtk::FILL, 4, 0);
+                       item_table.attach (remove_button, 7, 8, 0, 1, FILL, FILL, 4, 0);
                }
 
                /* XXX i can't find a way to hide the button without messing up 
@@ -267,7 +267,7 @@ LocationEditRow::set_location (Location *loc)
        }
 
        start_clock.set (location->start(), true);
-       
+
 
        if (!location->is_mark()) {
                if (!end_hbox.get_parent()) {
@@ -421,9 +421,9 @@ LocationEditRow::cd_toggled ()
                return;
        }
        
-       if (cd_check_button.get_active() == location->is_cd_marker()) {
-               return;
-       }
+       //if (cd_check_button.get_active() == location->is_cd_marker()) {
+       //      return;
+       //}
 
        if (cd_check_button.get_active()) {
                if (location->start() <= session->current_start_frame()) {
@@ -678,6 +678,11 @@ LocationUI::~LocationUI()
 {
 }
 
+void LocationUI::on_show()
+{
+       ArdourDialog::on_show();
+       refresh_location_list();
+}
 
 
 gint LocationUI::do_location_remove (ARDOUR::Location *loc)
@@ -788,10 +793,12 @@ LocationUI::map_locations (Locations::LocationList& locations)
                else if (location->is_auto_punch()) {
                        punch_edit_row.set_session (session);
                        punch_edit_row.set_location (location);
+                       punch_edit_row.show_all();
                }
                else if (location->is_auto_loop()) {
                        loop_edit_row.set_session (session);
                        loop_edit_row.set_location (location);
+                       loop_edit_row.show_all();
                }
                else {
                        erow = manage (new LocationEditRow(session, location));
@@ -856,6 +863,9 @@ LocationUI::refresh_location_list ()
        ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::refresh_location_list));
        using namespace Box_Helpers;
 
+       // this is just too expensive to do when window is not shown
+       if (!is_visible()) return;
+
        BoxList & loc_children = location_rows.children();
        BoxList & range_children = range_rows.children();