Merge lp:~marcustomlinson/indicator-sound/fix-scroll-wheel-step-sizes into lp:indicator-sound/13.10

[Marcus Tomlinson]

Modified sensitivity (step size) of the scroll wheel when adjusting volume level to a 5% delta on each wheel click, and matched scroll rates when mouse is over the indicator icon and on the volume slider.

[Charles Kerr (charlesk)]

I agree that there are two bugs here wrt (1) inconsistent scrolling and (2) no smaller steps being available for raising/lowering the volume, but we should fix these by bringing the code into agreement with the existing spec. See https://bugs.launchpad.net/indicator-sound/+bug/1091142 and https://bugs.launchpad.net/indicator-sound/+bug/1226931/comments/2

review: Needs Fixing

[lp:~marcustomlinson/indicator-sound/fix-scroll-wheel-step-sizes]

392. By Marcus Tomlinson on 2013-10-15

Increased sensitivity (step size) of the scroll wheel on volume slider when mouse is over the indicator icon, in order to match the scroll rate when the mouse is on the volume slider.

393. By Marcus Tomlinson on 2013-10-15

Fixed code formatting

[Marcus Tomlinson (marcustomlinson)]

I've updated my branch now to simply increase the scroll step size when hovering over the panel icon. Both volume adjustment methods now take 10 clicks of the scroll wheel to span the 0% to 100% range (as per spec).

[Charles Kerr (charlesk)]

Looks good. Thanks for the quick revision Marcus!

review: Approve

[Lars Karlitski (larsu)]

This will also change the sensitivity for the volume buttons on the phone. I can't find a design spec for that. Please don't merge this until we've talked to Matthew.

review: Needs Information

[Matthew Paul Thomas (mpt)]

I haven't specified volume changes on the phone yet at all. <https://wiki.ubuntu.com/Sound#Volume_changes> But some quick testing shows me that Windows Phone has 30 steps from silent to maximum, iOS has 16, and Android has ... 8. Android notwithstanding, I'm leery about reducing the number of steps from 16.7 (?!) to 10 on Ubuntu.

I don't remember why I specced 5% (20 steps) for the -/+/arrow keys on the PC, and 10% for the mouse wheel. Perhaps it was because scrolling a scrollwheel repeatedly is harder than holding down a button. I don't have a mouse wheel here; how many clicks does a typical swipe cause?

review: Needs Information (design)

[Marcus Tomlinson (marcustomlinson)]

> I haven't specified volume changes on the phone yet at all.
> <https://wiki.ubuntu.com/Sound#Volume_changes> But some quick testing shows me
> that Windows Phone has 30 steps from silent to maximum, iOS has 16, and
> Android has ... 8. Android notwithstanding, I'm leery about reducing the
> number of steps from 16.7 (?!) to 10 on Ubuntu.

My feeling is that currently the scroll wheel adjusts volume too quickly on the desktop. Comparing Mac OS X, the Ubuntu scroll wheel volume adjustment is about 5 times more sensitive (see my comment on: https://bugs.launchpad.net/indicator-sound/+bug/1226931).

> I don't remember why I specced 5% (20 steps) for the -/+/arrow keys on the PC,
> and 10% for the mouse wheel. Perhaps it was because scrolling a scrollwheel
> repeatedly is harder than holding down a button. I don't have a mouse wheel
> here; how many clicks does a typical swipe cause?

A typical swipe on my mouse has about 7 to 9 clicks.

[Matthew Paul Thomas (mpt)]

Okay then, how about a step of 5 percent for everything? Mousewheel on the title, mousewheel on the slider, -/+ keys on the slider, Left/Right keys on the slider, keyboard keys on the PC, and hardware keys on the phone.

[Marcus Tomlinson (marcustomlinson)]

> Okay then, how about a step of 5 percent for everything?

Sounds good to me.

[lp:~marcustomlinson/indicator-sound/fix-scroll-wheel-step-sizes]

394. By Marcus Tomlinson on 2013-10-29

Decreased scroll wheel volume adjustment step size to 5%.

[Lars Karlitski (larsu)]

Ah cool. Thanks Marcus!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/service.vala'
--- src/service.vala	2013-10-09 13:01:14 +0000
+++ src/service.vala	2013-10-29 16:09:33 +0000
@@ -87,7 +87,7 @@
 	uint player_action_update_id;
 	Notify.Notification notification;
 
-	const double volume_step_percentage = 0.06;
+	const double volume_step_percentage = 0.05;
 
 	void activate_scroll_action (SimpleAction action, Variant? param) {
 		int delta = param.get_int32(); /* positive for up, negative for down */

=== modified file 'src/sound-menu.vala'
--- src/sound-menu.vala	2013-10-28 23:54:31 +0000
+++ src/sound-menu.vala	2013-10-29 16:09:33 +0000
@@ -31,7 +31,7 @@
 		this.volume_section = new Menu ();
 		if (show_mute)
 			volume_section.append (_("Mute"), "indicator.mute");
-		volume_section.append_item (this.create_slider_menu_item ("indicator.volume(0)", 0.0, 1.0, 0.01,
+		volume_section.append_item (this.create_slider_menu_item ("indicator.volume(0)", 0.0, 1.0, 0.005,
 																  "audio-volume-low-zero-panel",
 																  "audio-volume-high-panel"));
 
@@ -67,7 +67,7 @@
 		}
 		set {
 			if (value && !this.mic_volume_shown) {
-				var slider = this.create_slider_menu_item ("indicator.mic-volume", 0.0, 1.0, 0.01,
+				var slider = this.create_slider_menu_item ("indicator.mic-volume", 0.0, 1.0, 0.005,
 														   "audio-input-microphone-low-zero-panel",
 														   "audio-input-microphone-high-panel");
 				volume_section.append_item (slider);