fixes for crossfade views, crossfades and undo/redo. added default crossfade settings...

[ardour.git] / gtk2_ardour / tempo_dialog.cc

diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 2a449da946bbf69fbf0252ee14458d3b07b92121..c5816e36d15c1c832da595cbe63f23207d67aef7 100644 (file)
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -11,8 +11,9 @@
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
+using namespace PBD;
 
-TempoDialog::TempoDialog (TempoMap& map, jack_nframes_t frame, const string & action)
+TempoDialog::TempoDialog (TempoMap& map, nframes_t frame, const string & action)
        : ArdourDialog ("tempo dialog"),
          bpm_frame (_("Beats per minute")),
          ok_button (action),
@@ -193,7 +194,7 @@ TempoDialog::get_bbt_time (BBT_Time& requested)
 }
 
 
-MeterDialog::MeterDialog (TempoMap& map, jack_nframes_t frame, const string & action)
+MeterDialog::MeterDialog (TempoMap& map, nframes_t frame, const string & action)
        : ArdourDialog ("meter dialog"),
          note_frame (_("Meter denominator")),
          bpb_frame (_("Beats per bar")),
@@ -259,9 +260,9 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova
        else
                note_types.set_active_text (_("quarter (4)"));
                
-       /* strings.back() just happens to be the longest one to display */
-       // GTK2FIX
-        //Gtkmm2ext::set_size_request_to_display_given_text (note_types, "thirty-second (32)", 7, 7);
+       /* the string here needs to be the longest one to display */
+       const guint32 FUDGE = 20; // Combo's are stupid - they steal space from the entry for the button
+        Gtkmm2ext::set_size_request_to_display_given_text (note_types, "thirty-second (32)", 7+FUDGE, 7);
 
        hspacer1.set_border_width (5);
        hspacer1.pack_start (note_types, false, false);