Various color tweaks.

[ardour.git] / gtk2_ardour / note_base.cc

diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index 641c1f6343e40b38b8d9a931b3c9cb2e49199e0a..71d8dd98fcfe964a3cc2da3dad2f87c31268c773 100644 (file)
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -96,7 +96,7 @@ NoteBase::show_velocity()
        if (!_text) {
                _text = new Text (_item->parent ());
                _text->set_ignore_events (true);
-               _text->set_color (ARDOUR_UI::config()->color ("midi note velocity text"));
+               _text->set_color (ARDOUR_UI::config()->color_mod ("midi note velocity text", "midi note velocity text"));
                _text->set_alignment (Pango::ALIGN_CENTER);
        }
 
@@ -122,7 +122,8 @@ NoteBase::on_channel_selection_change(uint16_t selection)
        // make note change its color if its channel is not marked active
        if ( (selection & (1 << _note->channel())) == 0 ) {
                set_fill_color(ARDOUR_UI::config()->color ("midi note inactive channel"));
-               set_outline_color(calculate_outline(ARDOUR_UI::config()->color ("midi note inactive channel")));
+               set_outline_color(calculate_outline(ARDOUR_UI::config()->color ("midi note inactive channel"),
+                                                   _selected));
        } else {
                // set the color according to the notes selection state
                set_selected(_selected);
@@ -149,12 +150,7 @@ NoteBase::set_selected(bool selected)
        _selected = selected;
        set_fill_color (base_color());
         
-       if (_selected) {
-               set_outline_color(calculate_outline(ARDOUR_UI::config()->color ("midi note selected")));
-       } else {
-               set_outline_color(calculate_outline(base_color()));
-       }
-
+       set_outline_color(calculate_outline(base_color(), _selected));
 }
 
 #define SCALE_USHORT_TO_UINT8_T(x) ((x) / 257)