From 78718c45d8de123703f8d9711fb802702bc8af64 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Thu, 21 Jan 2010 23:44:31 -0600 Subject: [PATCH] Mixer: Show peak value in tooltip on DPMs. --- Mixer/DPM.C | 5 +++++ Mixer/DPM.H | 2 ++ Mixer/Meter.H | 5 +++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Mixer/DPM.C b/Mixer/DPM.C index fd0eaff..648c47d 100644 --- a/Mixer/DPM.C +++ b/Mixer/DPM.C @@ -39,6 +39,8 @@ Fl_Color DPM::_dim_gradient[128]; DPM::DPM ( int X, int Y, int W, int H, const char *L ) : Meter( X, Y, W, H, L ) { + tooltip( peak_string ); + _last_drawn_hi_segment = 0; pixels_per_segment( 4 ); @@ -111,6 +113,9 @@ DPM::resize ( int X, int Y, int W, int H ) void DPM::draw ( void ) { + snprintf( peak_string, sizeof( peak_string ), "%.1f", peak() ); + tooltip( peak_string ); + int v = pos( value() ); int pv = pos( peak() ); diff --git a/Mixer/DPM.H b/Mixer/DPM.H index 4d9bdf7..70d9e63 100644 --- a/Mixer/DPM.H +++ b/Mixer/DPM.H @@ -25,6 +25,8 @@ class DPM : public Meter { + char peak_string[10]; + int _segments; int _pixels_per_segment; int _last_drawn_hi_segment; diff --git a/Mixer/Meter.H b/Mixer/Meter.H index 7261467..7114479 100644 --- a/Mixer/Meter.H +++ b/Mixer/Meter.H @@ -34,8 +34,9 @@ protected: virtual void draw ( void ) = 0; virtual int handle ( int m ) { - - if ( m == FL_PUSH ) + if ( m == FL_ENTER || m == FL_LEAVE ) + return 1; + else if ( m == FL_PUSH ) { // if ( Fl::event_button3() ) // hide();