Merge lp:~vanvugt/gsettings-ubuntu-touch-schemas/fix-1607240 into lp:gsettings-ubuntu-touch-schemas

Proposed by Daniel van Vugt
Status: Merged
Approved by: Iain Lane
Approved revision: 71
Merged at revision: 73
Proposed branch: lp:~vanvugt/gsettings-ubuntu-touch-schemas/fix-1607240
Merge into: lp:gsettings-ubuntu-touch-schemas
Diff against target: 25 lines (+2/-4)
1 file modified
accountsservice/com.ubuntu.AccountsService.Input.xml (+2/-4)
To merge this branch: bzr merge lp:~vanvugt/gsettings-ubuntu-touch-schemas/fix-1607240
Reviewer Review Type Date Requested Status
Iain Lane Approve
Lukáš Tinkl (community) Approve
Review via email: mp+301605@code.launchpad.net

Commit message

Correct the default scroll speed multiplier which should be 1.0 after
the other fixes for LP: #1607240 are in place in qtmir and qtubuntu.

Also remove comments suggesting that 1.0 is the maximum. Actually 1.0
is just the default/native speed and it's likely some users will want
higher values than 1.0 in future. A corresponding QML fix in
ubuntu-system-settings to raise this limit will be required.
(LP: #1607240)

To post a comment you must log in.
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

LGTM, makes sense together with the other patches

review: Approve
Revision history for this message
Iain Lane (laney) wrote :

Okey

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'accountsservice/com.ubuntu.AccountsService.Input.xml'
--- accountsservice/com.ubuntu.AccountsService.Input.xml 2016-04-05 17:22:15 +0000
+++ accountsservice/com.ubuntu.AccountsService.Input.xml 2016-08-01 02:50:46 +0000
@@ -16,9 +16,8 @@
16 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0.75"/>16 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0.75"/>
17 </property>17 </property>
1818
19 <!-- 0 to 1 -->
20 <property name="MouseScrollSpeed" type="d" access="readwrite">19 <property name="MouseScrollSpeed" type="d" access="readwrite">
21 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0.5"/>20 <annotation name="org.freedesktop.Accounts.DefaultValue" value="1.0"/>
22 </property>21 </property>
2322
24 <!-- in milliseconds -->23 <!-- in milliseconds -->
@@ -36,9 +35,8 @@
36 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0.75"/>35 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0.75"/>
37 </property>36 </property>
3837
39 <!-- 0 to 1 -->
40 <property name="TouchpadScrollSpeed" type="d" access="readwrite">38 <property name="TouchpadScrollSpeed" type="d" access="readwrite">
41 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0.5"/>39 <annotation name="org.freedesktop.Accounts.DefaultValue" value="1.0"/>
42 </property>40 </property>
4341
44 <!-- in milliseconds -->42 <!-- in milliseconds -->

Subscribers

People subscribed via source and target branches