diff options
| author | Doug McLain <doug@nostar.net> | 2007-06-15 22:08:27 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2007-06-15 22:08:27 +0000 |
| commit | 789cbb21810802adc478de3134fa42950c5e8569 (patch) | |
| tree | 565760bb936fea79f18697f72126111169bebae1 /gtk2_ardour/crossfade_view.cc | |
| parent | cd9fdb935f08966cc8c7170a39870e8adcae69d8 (diff) | |
Major Theme Manager changes, see ardour-dev
git-svn-id: svn://localhost/ardour2/trunk@1987 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/crossfade_view.cc')
| -rw-r--r-- | gtk2_ardour/crossfade_view.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index 261b2b3ca4..d2fdd94e03 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -61,11 +61,11 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, _visible = true; fade_in = new Line (*group); - fade_in->property_fill_color_rgba() = color_map[cCrossfadeLine]; + fade_in->property_fill_color_rgba() = Config->canvasvar_CrossfadeLine.get(); fade_in->property_width_pixels() = 1; fade_out = new Line (*group); - fade_out->property_fill_color_rgba() = color_map[cCrossfadeLine]; + fade_out->property_fill_color_rgba() = Config->canvasvar_CrossfadeLine.get(); fade_out->property_width_pixels() = 1; set_y_position_and_height (0, get_time_axis_view().height); @@ -84,6 +84,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, crossfade_changed (Change (~0)); crossfade->StateChanged.connect (mem_fun(*this, &CrossfadeView::crossfade_changed)); + ColorsChanged.connect (mem_fun (*this, &CrossfadeView::color_handler)); } CrossfadeView::~CrossfadeView () @@ -219,15 +220,21 @@ void CrossfadeView::active_changed () { if (crossfade->active()) { - frame->property_fill_color_rgba() = color_map[cActiveCrossfade]; + frame->property_fill_color_rgba() = Config->canvasvar_ActiveCrossfade.get(); } else { - frame->property_fill_color_rgba() = color_map[cInactiveCrossfade]; + frame->property_fill_color_rgba() = Config->canvasvar_InactiveCrossfade.get(); } redraw_curves (); } void +CrossfadeView::color_handler () +{ + active_changed (); +} + +void CrossfadeView::set_valid (bool yn) { _valid = yn; @@ -262,3 +269,4 @@ CrossfadeView::fake_hide () { group->hide(); } + |