diff options
author | David Robillard <d@drobilla.net> | 2014-12-16 00:05:45 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-12-16 00:05:45 -0500 |
commit | e0cb9efb003500fea319552a772364f00753a26f (patch) | |
tree | b49c48d16b2a0e5b9fb94cfa4c335671be3e7fd5 /gtk2_ardour/automation_streamview.cc | |
parent | 211f8f61d7cc11dcf867010735e335201563b1d2 (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/automation_streamview.cc')
-rw-r--r-- | gtk2_ardour/automation_streamview.cc | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index c4787f14ea..89ae7fa079 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -31,19 +31,21 @@ #include "ardour/midi_region.h" #include "ardour/midi_source.h" -#include "automation_streamview.h" -#include "region_view.h" +#include "ardour_ui.h" #include "automation_region_view.h" +#include "automation_streamview.h" #include "automation_time_axis.h" -#include "region_selection.h" -#include "selection.h" +#include "global_signals.h" +#include "gui_thread.h" #include "public_editor.h" -#include "ardour_ui.h" +#include "region_selection.h" +#include "region_view.h" #include "rgb_macros.h" -#include "gui_thread.h" +#include "selection.h" using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Editing; @@ -56,7 +58,9 @@ AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv) CANVAS_DEBUG_NAME (_canvas_group, string_compose ("SV canvas group auto %1", tv.name())); CANVAS_DEBUG_NAME (canvas_rect, string_compose ("SV canvas rectangle auto %1", tv.name())); - canvas_rect->set_fill (false); + color_handler (); + + ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler)); } AutomationStreamView::~AutomationStreamView () @@ -191,13 +195,11 @@ AutomationStreamView::setup_rec_box () void AutomationStreamView::color_handler () { - /*if (_trackview.is_midi_track()) { - canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_MidiTrackBase(); + if (_trackview.is_midi_track()) { + canvas_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("midi track base", "midi track base")); + } else { + canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("midi bus base")); } - - if (!_trackview.is_midi_track()) { - canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_MidiBusBase();; - }*/ } AutoState |