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/time_axis_view_item.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/time_axis_view_item.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 60b39e1c71..78c5b3299a 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -169,6 +169,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event)); fill_color = base_color; + _fill_color_name = "region base"; samples_per_pixel = fpp; frame_position = start; item_duration = duration; @@ -729,21 +730,19 @@ TimeAxisViewItem::fill_opacity () const return 130; } - uint32_t col = ARDOUR_UI::config()->color_mod ("region base", "region base"); + uint32_t col = ARDOUR_UI::config()->color_mod (_fill_color_name, _fill_color_name); return UINT_RGBA_A (col); } uint32_t TimeAxisViewItem::get_fill_color () const { - uint32_t f; - uint32_t o; - - o = fill_opacity (); + uint32_t f; + uint32_t o = fill_opacity (); if (_selected) { - f = ARDOUR_UI::config()->color ("selected region base"); + f = ARDOUR_UI::config()->color ("selected region base"); if (o == 0) { /* some condition of this item has set fill opacity to @@ -759,7 +758,7 @@ TimeAxisViewItem::get_fill_color () const f = ARDOUR_UI::config()->color ("recording rect"); } else { if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) { - f = ARDOUR_UI::config()->color_mod ("region base", "region base"); + f = ARDOUR_UI::config()->color_mod (_fill_color_name, _fill_color_name); } else { f = fill_color; } |