From a9846d1fc3c5335e220ba590949466b8eca5ae23 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Fri, 23 Oct 2020 22:05:46 -0700
Subject: [PATCH] Mixer: Tweak meter appearance.

---
 mixer/src/DPM.C                    | 52 +++++++++++++++++-------------
 mixer/src/Meter_Indicator_Module.C |  2 +-
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/mixer/src/DPM.C b/mixer/src/DPM.C
index 2fc6d32..d08a27b 100644
--- a/mixer/src/DPM.C
+++ b/mixer/src/DPM.C
@@ -49,7 +49,7 @@ DPM::DPM ( int X, int Y, int W, int H, const char *L ) :
 
 //    resize( X, Y, W, H );
 
-    dim( 0.85f );
+    dim( 0.95f );
 
     box( FL_NO_BOX );
     color( fl_color_average( FL_BLACK,  FL_BACKGROUND_COLOR, 0.66f ) );
@@ -57,18 +57,26 @@ DPM::DPM ( int X, int Y, int W, int H, const char *L ) :
     /* initialize gradients */
     if ( DPM::_gradient[ 0 ] == 0 )
     {
-        int breaks[] = {0,60,70,80,90,127};
+	int breaks[] = {0,80,90,110,127};
 
-        Fl_Color cols[] = { 
-            fl_rgb_color( 45,58,64),
-            fl_rgb_color( 84,181,195 ), 
-            fl_rgb_color( 122,200,211 ), 
-            fl_rgb_color( 178,213,212 ), 
-            fl_rgb_color( 209,213,179 ),
-            fl_rgb_color( 250, 40, 30 )
+	Fl_Color cols[] = { 
+            fl_darker( FL_CYAN ),
+            FL_CYAN,
+	    fl_lighter( FL_CYAN ),
+            fl_color_average( FL_YELLOW, FL_RED, 0.50f ),
+            FL_RED
         };
 
-        DPM::blend( 6, breaks, cols, color() );
+	for ( int i = 0; i < 4; ++i )
+	{
+	    cols[i] = fl_color_average( cols[i], FL_BACKGROUND_COLOR, 0.60f );
+	}
+
+        DPM::blend( 5,
+		    breaks,
+		    cols,
+		    color() );
+
     }
 
     {
@@ -244,19 +252,19 @@ DPM::draw ( void )
             fl_rectf( X, yy, W, bh, c );
         }
         
-        /* if ( _pixels_per_segment >= 3 ) */
-        /* { */
-        /*     fl_color( FL_CYAN ); */
+        if ( _pixels_per_segment >= 3 )
+        {
+            fl_color( FL_BLACK );
 
-        /*     if ( type() == FL_HORIZONTAL ) */
-        /*     { */
-        /*         fl_line( xx, Y, xx, Y + H - 1 ); */
-        /*     } */
-        /*     else */
-        /*     { */
-        /*         fl_line( X, yy, X + W - 1, yy ); */
-        /*     } */
-        /* } */
+            if ( type() == FL_HORIZONTAL )
+            {
+                fl_line( xx, Y, xx, Y + H - 1 );
+            }
+            else
+            {
+                fl_line( X, yy, X + W - 1, yy );
+            }
+        }
 
         /* } */
         /* else */
diff --git a/mixer/src/Meter_Indicator_Module.C b/mixer/src/Meter_Indicator_Module.C
index 8bc40b9..56a5c49 100644
--- a/mixer/src/Meter_Indicator_Module.C
+++ b/mixer/src/Meter_Indicator_Module.C
@@ -57,7 +57,7 @@ Meter_Indicator_Module::Meter_Indicator_Module ( bool is_default )
     dpm_pack->color( FL_BACKGROUND_COLOR );
     dpm_pack->box( FL_FLAT_BOX );
     dpm_pack->type( FL_HORIZONTAL );
-    dpm_pack->spacing(1);
+    dpm_pack->spacing(2);
     
     end();