13
0

Use selected fill color for selected notes.

This commit is contained in:
David Robillard 2015-01-08 18:32:24 -05:00
parent ec17b5388f
commit b3c7578b69
2 changed files with 5 additions and 3 deletions

View File

@ -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"/>

View File

@ -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));
}
}