Drag zoom area now fills the whole canvas

[ardour.git] / gtk2_ardour / visual_time_axis.cc

diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc
index cf2582bd156874a0d16e8ce93842c95825c4d40f..20fe13603e742a8bb188edd6f0a057d7a2f9f045 100644 (file)
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -55,6 +55,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace sigc;
 using namespace Gtk;
        
@@ -198,7 +199,12 @@ VisualTimeAxis::visual_click()
 void
 VisualTimeAxis::hide_click()
 {
+       // LAME fix for hide_button display refresh
+       hide_button.set_sensitive(false);
+       
        editor.hide_track_in_display (*this);
+       
+       hide_button.set_sensitive(true);
 }
 
 
@@ -254,7 +260,7 @@ VisualTimeAxis::set_time_axis_color(Gdk::Color c)
 }
 
 void
-VisualTimeAxis::set_selected_regionviews (AudioRegionSelection& regions)
+VisualTimeAxis::set_selected_regionviews (RegionSelection& regions)
 {
        // Not handled by purely visual TimeAxis
 }
@@ -323,6 +329,7 @@ VisualTimeAxis::start_time_axis_rename()
 
        name_prompter.set_prompt (_("new name: ")) ;
        name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
+       name_prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
        name_prompter.show_all() ;
 
        switch (name_prompter.run ()) {
@@ -368,17 +375,17 @@ VisualTimeAxis::name_entry_changed()
                return;
        }
 
+       strip_whitespace_edges(x);
+
        if (x.length() == 0) {
                name_entry.set_text (time_axis_name);
                return;
        }
 
-       strip_whitespace_edges(x);
-
        if (!editor.get_named_time_axis(x)) {
                set_time_axis_name(x, this);
        } else {
-               ARDOUR_UI::instance()->popup_error (_("a track already exists with that name"));
+               ARDOUR_UI::instance()->popup_error (_("A track already exists with that name"));
                name_entry.set_text(time_axis_name);
        }
 }
@@ -418,7 +425,7 @@ VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev)
 // Super class methods not handled by VisualTimeAxis
                
 void
-VisualTimeAxis::show_timestretch (jack_nframes_t start, jack_nframes_t end)
+VisualTimeAxis::show_timestretch (nframes_t start, nframes_t end)
 {
   // Not handled by purely visual TimeAxis
 }