diff options
author | David Robillard <d@drobilla.net> | 2015-01-08 18:32:24 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2015-01-08 18:36:10 -0500 |
commit | b3c7578b692c15c59a1bac0dc13dfbc1a02cdfde (patch) | |
tree | 2079ba393587f7cff097474265b1916b47596171 /gtk2_ardour | |
parent | ec17b5388f4c0f1786d069481a2fc6f5bbf33f3b (diff) |
Use selected fill color for selected notes.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/dark.colors | 2 | ||||
-rw-r--r-- | gtk2_ardour/note_base.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors index 7252c30bb5..6355219f42 100644 --- 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 9a135e4d9c..01c85b07f0 100644 --- 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)); } } |