From 2c95bfcd46d9093f665bbedfad3cdf73e45f3d35 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Fri, 4 Jan 2013 16:52:10 +0000 Subject: [PATCH] quick fix for bug reported by ricardus: faders in Play are no longer dark gray which made them invisible. and they update color when their auto state changes. git-svn-id: svn://localhost/ardour2/branches/3.0@13773 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour3_styles.rc.in | 2 +- gtk2_ardour/gain_meter.cc | 1 + libs/gtkmm2ext/gtkmm2ext/pixfader.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in index 4e18ce068a..271ee2ec0a 100644 --- a/gtk2_ardour/ardour3_styles.rc.in +++ b/gtk2_ardour/ardour3_styles.rc.in @@ -785,7 +785,7 @@ style "plugin_slider" fg[NORMAL] = @@COLPREFIX@_bright_color fg[ACTIVE] = @@COLPREFIX@_bright_color - fg[INSENSITIVE] = @@COLPREFIX@_base # matches default + fg[INSENSITIVE] = @@COLPREFIX@_lightest # matches default fg[SELECTED] = @@COLPREFIX@_bright_color fg[PRELIGHT] = @@COLPREFIX@_bright_color diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index dbe873634c..5fe3847e6f 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -538,6 +538,7 @@ GainMeterBase::update_gain_sensitive () { bool x = !(_amp->gain_control()->alist()->automation_state() & Play); static_cast(gain_slider)->set_sensitive (x); + gain_slider->create_patterns(); } static MeterPoint diff --git a/libs/gtkmm2ext/gtkmm2ext/pixfader.h b/libs/gtkmm2ext/gtkmm2ext/pixfader.h index d105bbb2d1..40f214f087 100644 --- a/libs/gtkmm2ext/gtkmm2ext/pixfader.h +++ b/libs/gtkmm2ext/gtkmm2ext/pixfader.h @@ -38,6 +38,8 @@ class PixFader : public Gtk::DrawingArea void set_fader_length (int); void set_border_colors (uint32_t rgba_left, uint32_t rgba_right); + void create_patterns(); + void set_default_value (float); void set_text (const std::string&); @@ -94,7 +96,6 @@ class PixFader : public Gtk::DrawingArea GdkRectangle view; - void create_patterns(); cairo_pattern_t* pattern; cairo_pattern_t* shine_pattern;