From f2ed595cda0766818e397dd433a9743a4eeeab38 Mon Sep 17 00:00:00 2001 From: Shoh Sewell Date: Wed, 3 May 2023 16:41:07 -0700 Subject: [PATCH 1/2] Adds decimal digits to volume slider tooltip Modifies the volume slider tooltip so that: -If the volume slider falls below 10%, the volume tooltip will display one decimal digit of precision (e.g. 3.4%). -Else if the volume slider falls below 1%, display one decimal digit of precision (e.g. 0.34%). -Otherwise display the volume slider tooltip as normal. This helps show changes in volume between 0% and 10% where a change in volume isn't shown in the UI but is heard (especially when the "Limit volume control to 100%" option is unchecked in the "Output" Preferences submenu. --- Window/VolumeSlider.m | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Window/VolumeSlider.m b/Window/VolumeSlider.m index a2a489afd..37fec33a9 100644 --- a/Window/VolumeSlider.m +++ b/Window/VolumeSlider.m @@ -64,7 +64,15 @@ static void *kVolumeSliderContext = &kVolumeSliderContext; double volume; volume = linearToLogarithmic(value, MAX_VOLUME); - NSString *text = [NSString stringWithFormat:@"%0.lf%%", volume]; + // If volume becomes less than 1%, display two decimal digits of precision (e.g. 0.34%). + if(volume < 1) + NSString *text = [NSString stringWithFormat:@"%0.2lf%%", volume]; + // Else if volume becomes less than 10%, display one decimal digit of precision (e.g. 3.4%). + else if(volume < 10) + NSString *text = [NSString stringWithFormat:@"%0.1lf%%", volume]; + // Else display no decimal digits. + else + NSString *text = [NSString stringWithFormat:@"%0.lf%%", volume]; [textView setString:text]; } -- 2.45.2 From 8a06f2ad1c302bba04d9e5560363bd2a7096bbb1 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Wed, 3 May 2023 17:21:08 -0700 Subject: [PATCH 2/2] Update VolumeSlider.m Fix variable declaration --- Window/VolumeSlider.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Window/VolumeSlider.m b/Window/VolumeSlider.m index 37fec33a9..14223f32a 100644 --- a/Window/VolumeSlider.m +++ b/Window/VolumeSlider.m @@ -63,16 +63,17 @@ static void *kVolumeSliderContext = &kVolumeSliderContext; double value = [self doubleValue]; double volume; volume = linearToLogarithmic(value, MAX_VOLUME); + NSString *text; // If volume becomes less than 1%, display two decimal digits of precision (e.g. 0.34%). if(volume < 1) - NSString *text = [NSString stringWithFormat:@"%0.2lf%%", volume]; + text = [NSString stringWithFormat:@"%0.2lf%%", volume]; // Else if volume becomes less than 10%, display one decimal digit of precision (e.g. 3.4%). else if(volume < 10) - NSString *text = [NSString stringWithFormat:@"%0.1lf%%", volume]; + text = [NSString stringWithFormat:@"%0.1lf%%", volume]; // Else display no decimal digits. else - NSString *text = [NSString stringWithFormat:@"%0.lf%%", volume]; + text = [NSString stringWithFormat:@"%0.lf%%", volume]; [textView setString:text]; } -- 2.45.2