summaryrefslogtreecommitdiff
path: root/gtk2_ardour/note_base.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-12-16 00:05:45 -0500
committerDavid Robillard <d@drobilla.net>2014-12-16 00:05:45 -0500
commite0cb9efb003500fea319552a772364f00753a26f (patch)
treeb49c48d16b2a0e5b9fb94cfa4c335671be3e7fd5 /gtk2_ardour/note_base.cc
parent211f8f61d7cc11dcf867010735e335201563b1d2 (diff)
Various color tweaks.
This commit changes some color names, nuke your theme. This isn't quite ideal yet, but takes some steps towards where I think things should go aesthetically: Make automation tracks/regions colors correspond to their parent's type. Make selected MIDI notes outlined in red like most everything else, and scrap separate min/mid/max fill colors for selected MIDI notes. Color automation ghost MIDI notes based on original note color. Try to kill 90's looking brightish gray gradients in general.
Diffstat (limited to 'gtk2_ardour/note_base.cc')
-rw-r--r--gtk2_ardour/note_base.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index 158161d62d..71d8dd98fc 100644
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -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)