diff options
| -rw-r--r-- | gtk2_ardour/dark.colors | 14 | ||||
| -rw-r--r-- | gtk2_ardour/note_base.h | 16 |
2 files changed, 18 insertions, 12 deletions
diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors index 5ab3377222..7a092a5109 100644 --- a/gtk2_ardour/dark.colors +++ b/gtk2_ardour/dark.colors @@ -75,6 +75,7 @@ <Color name="color 6" value="0x44bc50ff"/> <Color name="color 60" value="0x50545aff"/> <Color name="color 61" value="0x20242aff"/> + <Color name="color 62" value="0x8894ffff"/> <Color name="color 63" value="0x5566ffff"/> <Color name="color 64" value="0xa7acd4ff"/> <Color name="color 65" value="0xb8cca3ff"/> @@ -266,9 +267,9 @@ <ColorAlias name="midi meter color7" alias="color 56"/> <ColorAlias name="midi meter color8" alias="color 56"/> <ColorAlias name="midi meter color9" alias="color 17"/> - <ColorAlias name="midi note color max" alias="color 52"/> - <ColorAlias name="midi note color mid" alias="color 57"/> - <ColorAlias name="midi note color min" alias="color 58"/> + <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 inactive channel" alias="color 4"/> <ColorAlias name="midi note selected" alias="color 59"/> <ColorAlias name="midi note velocity text" alias="color 32"/> @@ -369,7 +370,7 @@ <ColorAlias name="region list automatic" alias="color 53"/> <ColorAlias name="region list missing source" alias="color 9"/> <ColorAlias name="region list whole file" alias="color 1"/> - <ColorAlias name="region area covered by another region" alias="color 87"/> + <ColorAlias name="covered region" alias="color 87"/> <ColorAlias name="region base" alias="color 11"/> <ColorAlias name="route button: fill active" alias="color 67"/> <ColorAlias name="route button: led active" alias="color 8"/> @@ -393,6 +394,9 @@ <ColorAlias name="secondary delta clock: cursor" alias="color 9"/> <ColorAlias name="secondary delta clock: edited text" alias="color 9"/> <ColorAlias name="secondary delta clock: text" alias="color 92"/> + <ColorAlias name="selected midi note max" alias="color 62"/> + <ColorAlias name="selected midi note mid" alias="color 93"/> + <ColorAlias name="selected midi note min" alias="color 61"/> <ColorAlias name="selected region base" alias="color 25"/> <ColorAlias name="selected time axis frame" alias="color 86"/> <ColorAlias name="selected waveform fill" alias="color 8"/> @@ -498,5 +502,7 @@ <Modifier name="piano roll black" modifier="= alpha:0.4196"/> <Modifier name="selection rect" modifier="= alpha:0.4666"/> <Modifier name="silence" modifier="= alpha:0.4784"/> + <Modifier name="midi note" modifier="= alpha:0.5333"/> + <Modifier name="selected midi note" modifier="= alpha:0.7529"/> </Modifiers> </Ardour> diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h index f76c184a20..22dd9d462e 100644 --- a/gtk2_ardour/note_base.h +++ b/gtk2_ardour/note_base.h @@ -106,25 +106,25 @@ class NoteBase : public sigc::trackable if (selected) { if (vel < 64) { return UINT_INTERPOLATE( - ARDOUR_UI::config()->color ("selected midi note color min"), - ARDOUR_UI::config()->color ("selected midi note color mid"), + ARDOUR_UI::config()->color_mod ("selected midi note min", "selected midi note"), + ARDOUR_UI::config()->color_mod ("selected midi note mid", "selected midi note"), (vel / (double)63.0)); } else { return UINT_INTERPOLATE( - ARDOUR_UI::config()->color ("selected midi note color mid"), - ARDOUR_UI::config()->color ("selected midi note color max"), + ARDOUR_UI::config()->color_mod ("selected midi note mid", "selected midi note"), + ARDOUR_UI::config()->color_mod ("selected midi note max", "selected midi note"), ((vel-64) / (double)63.0)); } } else { if (vel < 64) { return UINT_INTERPOLATE( - ARDOUR_UI::config()->color ("midi note color min"), - ARDOUR_UI::config()->color ("midi note color mid"), + ARDOUR_UI::config()->color_mod ("midi note min", "midi note"), + ARDOUR_UI::config()->color_mod ("midi note mid", "midi note"), (vel / (double)63.0)); } else { return UINT_INTERPOLATE( - ARDOUR_UI::config()->color ("midi note color mid"), - ARDOUR_UI::config()->color ("midi note color max"), + ARDOUR_UI::config()->color_mod ("midi note mid", "midi note"), + ARDOUR_UI::config()->color_mod ("midi note max", " midi note"), ((vel-64) / (double)63.0)); } } |