leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(audio): normalize tray wheel to ±5% per event; drop magic constant

Browse source
This commit is contained in:
antronset 2025-09-12 22:58:54 +02:00 • committed by Ashley Wulber
parent 8196fc6425
commit 21c62440fd
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cosmic-applet-audio/src/lib.rs
View file

@ -706,21 +706,21 @@ impl cosmic::Application for Audio {
.applet .applet
.icon_button(self.output_icon_name()) .icon_button(self.output_icon_name())
.on_press_down(Message::TogglePopup); .on_press_down(Message::TogglePopup);
const WHEEL_STEP: f64 = 5.0; // 5% per wheel event
let btn = crate::mouse_area::MouseArea::new(btn).on_mouse_wheel(|delta| { let btn = crate::mouse_area::MouseArea::new(btn).on_mouse_wheel(|delta| {
let change = match delta { // normalize: ignore magnitude, keep only direction
iced::mouse::ScrollDelta::Lines { x, y } => (x + y) * 5., let dir = match delta {
iced::mouse::ScrollDelta::Pixels { y, .. } => y / 40.3125, iced::mouse::ScrollDelta::Lines { y, .. } => y.signum(), // -1/0/1
iced::mouse::ScrollDelta::Pixels { y, .. } => y.signum(), // -1/0/1
}; };
if change.abs() < f32::EPSILON { if dir == 0.0 {
return Message::Ignore; return Message::Ignore;
} }
let new_volume = self let new_volume = (self.output_volume + (dir as f64) * WHEEL_STEP).clamp(0.0, 150.0);
.current_output
.as_ref()
.map_or(0f64, |v| volume_to_percent(v.volume.avg()) + change as f64)
.clamp(0.0, 150.0);
Message::SetOutputVolume(new_volume) Message::SetOutputVolume(new_volume)
}); });
let playback_buttons = (!self.core.applet.suggested_bounds.as_ref().is_some_and(|c| { let playback_buttons = (!self.core.applet.suggested_bounds.as_ref().is_some_and(|c| {
// if we have a configure for width and height, we're in a overflow popup // if we have a configure for width and height, we're in a overflow popup
c.width > 0. && c.height > 0. c.width > 0. && c.height > 0.