diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-19 09:53:51 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-19 09:53:51 -0500 |
| commit | b73477b250ed299c84ab416e50e33e67428b3a34 (patch) | |
| tree | 93db76fdb4e2bdcb1b0cf61e376618129338e6ae /gtk2_ardour | |
| parent | a494211e737eb47ffb135400f757a44fae16016f (diff) | |
add more controllable modifiers for region transparency
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/dark.colors | 2 | ||||
| -rw-r--r-- | gtk2_ardour/region_view.cc | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors index 5c3e8bb719..2b543b2aac 100644 --- a/gtk2_ardour/dark.colors +++ b/gtk2_ardour/dark.colors @@ -499,6 +499,8 @@ <Modifier name="piano roll white" modifier="= alpha:0.4627"/> <Modifier name="recording rect" modifier="= alpha:0.25"/> <Modifier name="region base" modifier="= alpha:0.99"/> + <Modifier name="opaque region base" modifier="= alpha:0.99"/> + <Modifier name="transparent region base" modifier="= alpha:0.50"/> <Modifier name="selected midi note" modifier="= alpha:0.7529"/> <Modifier name="selection rect" modifier="= alpha:0.4666"/> <Modifier name="silence" modifier="= alpha:0.4784"/> diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index c9c423e68a..93b8fa3321 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -525,11 +525,16 @@ RegionView::set_colors () uint32_t RegionView::get_fill_color () const { - uint32_t f = TimeAxisViewItem::get_fill_color(); + ArdourCanvas::Color f = TimeAxisViewItem::get_fill_color(); + char const *modname; + if (_region->opaque()) { - f = UINT_RGBA_CHANGE_A (f, 255); + modname = "opaque region base"; + } else { + modname = "transparent region base"; } - return f; + + return HSV(f).mod (ARDOUR_UI::config()->modifier (modname)).color (); } void |