fix background of ArdourButtons with no Body

[ardour.git] / gtk2_ardour / edit_note_dialog.cc

diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc
index 2782122dbf0693f89c36ed296586280b1ffb05fb..ae154807a25e01aff4abc6254c5ef34215305ed8 100644 (file)
--- a/gtk2_ardour/edit_note_dialog.cc
+++ b/gtk2_ardour/edit_note_dialog.cc
@@ -112,13 +112,13 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n)
        _velocity_all.set_sensitive (false);
        _time_all.set_sensitive (false);
        _length_all.set_sensitive (false);
-       
+
        int test_channel = (*_events.begin())->note()->channel ();
        int test_pitch = (*_events.begin())->note()->note ();
        int test_velocity = (*_events.begin())->note()->velocity ();
-       double test_time = (*_events.begin())->note()->time ();
-       double test_length = (*_events.begin())->note()->length ();
-       
+       Evoral::Beats test_time = (*_events.begin())->note()->time ();
+       Evoral::Beats test_length = (*_events.begin())->note()->length ();
+
        for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
                if ((*i)->note()->channel() != test_channel) {
                        _channel_all.set_sensitive (true);
@@ -140,22 +140,19 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n)
                        _length_all.set_sensitive (true);
                }
        }
-       
+
        get_vbox()->pack_start (*table);
 
        add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
        add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_ACCEPT);
        set_default_response (Gtk::RESPONSE_ACCEPT);
-
-       show_all ();
 }
 
-int
-EditNoteDialog::run ()
+void
+EditNoteDialog::done (int r)
 {
-       int const r = Dialog::run ();
        if (r != RESPONSE_ACCEPT) {
-               return r;
+                return;
        }
 
        /* These calls mean that if a value is entered using the keyboard
@@ -196,7 +193,7 @@ EditNoteDialog::run ()
                }
        }
 
-       double const t = _region_view->source_relative_time_converter().from (_time_clock.current_time ());
+       Evoral::Beats const t = _region_view->source_relative_time_converter().from (_time_clock.current_time ());
 
        if (!_time_all.get_sensitive() || _time_all.get_active ()) {
                for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
@@ -207,7 +204,7 @@ EditNoteDialog::run ()
                }
        }
 
-       double const d = _region_view->region_relative_time_converter().from (_length_clock.current_duration ());
+       Evoral::Beats const d = _region_view->region_relative_time_converter().from (_length_clock.current_duration ());
 
        if (!_length_all.get_sensitive() || _length_all.get_active ()) {
                for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
@@ -227,6 +224,4 @@ EditNoteDialog::run ()
        for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
                (*i)->set_selected ((*i)->selected()); // change color
        }
-
-       return r;
 }