Use selected fill color for selected notes.

diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors
index 7252c30bb5b6e405f12062e6cd2ebb4beff10b41..6355219f42cdf9254f0260ff88b6d096cd3db44f 100644 (file)
--- a/gtk2_ardour/dark.colors
+++ b/gtk2_ardour/dark.colors
@@ -272,7 +272,7 @@
     <ColorAlias name="midi note max" alias="color 52"/>
     <ColorAlias name="midi note mid" alias="color 57"/>
     <ColorAlias name="midi note min" alias="color 58"/>
-    <ColorAlias name="midi note selected" alias="color 59"/>
+    <ColorAlias name="midi note selected" alias="color 40"/>
     <ColorAlias name="midi note selected outline" alias="color 9"/>
     <ColorAlias name="midi note velocity text" alias="color 32"/>
     <ColorAlias name="midi patch change fill" alias="color 60"/>

diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index 9a135e4d9c6b2433f16a699c4954f1bbdbbc1370..01c85b07f0f406880871ac78ff3bcb4b9bd6af84 100644 (file)
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -104,7 +104,9 @@ class NoteBase : public sigc::trackable
        MidiRegionView& region_view() const { return _region; }
 
        inline static uint32_t meter_style_fill_color(uint8_t vel, bool selected) {
-               if (vel < 64) {
+               if (selected) {
+                       return ARDOUR_UI::config()->color_mod ("midi note selected", "midi note");
+               } else if (vel < 64) {
                        return UINT_INTERPOLATE(
                                ARDOUR_UI::config()->color_mod ("midi note min", "midi note"),
                                ARDOUR_UI::config()->color_mod ("midi note mid", "midi note"),
@@ -112,7 +114,7 @@ class NoteBase : public sigc::trackable
                } else {
                        return UINT_INTERPOLATE(
                                ARDOUR_UI::config()->color_mod ("midi note mid", "midi note"),
-                               ARDOUR_UI::config()->color_mod ("midi note max", " midi note"),
+                               ARDOUR_UI::config()->color_mod ("midi note max", "midi note"),
                                ((vel-64) / (double)63.0));
                }
        }