diff options
| author | Robin Gareus <robin@gareus.org> | 2014-12-09 19:39:44 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-12-09 19:41:54 +0100 |
| commit | 8e931398720357a74cdc12c56dd8225380f13ccb (patch) | |
| tree | 2539b56c6c11c9d0990154dae73046b8eb32bf9e | |
| parent | 724febc82c7c1d7aa9a1aa6607e9f2f705df457b (diff) | |
fix meter scale colors (meterbridge)
| -rw-r--r-- | gtk2_ardour/dark.colors | 6 | ||||
| -rw-r--r-- | gtk2_ardour/meter_patterns.cc | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors index 76dc06f8cc..d407ef5ceb 100644 --- a/gtk2_ardour/dark.colors +++ b/gtk2_ardour/dark.colors @@ -267,10 +267,10 @@ <ColorAlias name="meterbridge peakindicator: led" alias="color 9"/> <ColorAlias name="meterbridge peakindicator: led active" alias="color 9"/> <ColorAlias name="meterbridge peaklabel" alias="color 9"/> - <ColorAlias name="meterstrip dpm fg" alias="color 9"/> - <ColorAlias name="meterstrip ppm fg" alias="color 13"/> + <ColorAlias name="meterstrip dpm fg" alias="color 31"/> + <ColorAlias name="meterstrip ppm fg" alias="color 31"/> <ColorAlias name="meterstrip vu fg" alias="color 4"/> - <ColorAlias name="meterstrip dpm bg" alias="color 9"/> + <ColorAlias name="meterstrip dpm bg" alias="color 27"/> <ColorAlias name="meterstrip ppm bg" alias="color 27"/> <ColorAlias name="meterstrip vu bg" alias="color 32"/> <ColorAlias name="midi bus base" alias="color 4"/> diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc index 6e602553e9..392693fe5d 100644 --- a/gtk2_ardour/meter_patterns.cc +++ b/gtk2_ardour/meter_patterns.cc @@ -236,10 +236,12 @@ static void set_bg_color (Gtk::Widget& w, cairo_t* cr, MeterType type) { case MeterIEC1NOR: case MeterIEC2BBC: case MeterIEC2EBU: + ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip ppm bg"), r, g, b, a); + break; case MeterK12: case MeterK14: case MeterK20: - ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip ppm bg"), r, g, b, a); + ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip dpm bg"), r, g, b, a); break; default: { @@ -258,10 +260,15 @@ static void set_fg_color(Gtk::Widget&, MeterType type, Gdk::Color * c) { switch(type) { case MeterVU: ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip vu fg"), r, g, b, a); - + break; + case MeterIEC1DIN: + case MeterIEC1NOR: + case MeterIEC2BBC: + case MeterIEC2EBU: + ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip ppm fg"), r, g, b, a); break; default: - ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip vu fg"), r, g, b, a); + ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip dpm fg"), r, g, b, a); break; } c->set_rgb_p (r, g, b); |