Differential D28331 Diff 78635 kcms/touchpad/src/kcm/libinput/touchpad.qml

Changeset View

Standalone View

View Options

kcms/touchpad/src/kcm/libinput/touchpad.qml

Show All 35 Lines29Kirigami.ScrollablePage {
36 property alias deviceIndex: deviceSelector.currentIndex 36​ property alias deviceIndex: deviceSelector.currentIndex
37 signal changeSignal() 37​ signal changeSignal()
38 38​
39 property QtObject touchpad 39​ property QtObject touchpad
40 property int touchpadCount: backend.touchpadCount 40​ property int touchpadCount: backend.touchpadCount
41 41​
42 property bool loading: false 42​ property bool loading: false
43 43​
44​ enabled: touchpadCount > 0
45​
44 function resetModel(index) { 46​ function resetModel(index) {
45 touchpadCount = backend.touchpadCount 47​ touchpadCount = backend.touchpadCount
46 formLayout.enabled = touchpadCount 48​ formLayout.enabled = touchpadCount
47 deviceSelector.enabled = touchpadCount > 1 49​ deviceSelector.enabled = touchpadCount > 1
48 50​
49 loading = true 51​ loading = true
50 if (touchpadCount) { 52​ if (touchpadCount) {
51 touchpad = deviceModel[index] 53​ touchpad = deviceModel[index]
Show All 18 Lines65 function syncValuesFromBackend() {
70 accelSpeed.load() 72​ accelSpeed.load()
71 accelProfile.load() 73​ accelProfile.load()
72 tapToClick.load() 74​ tapToClick.load()
73 tapAndDrag.load() 75​ tapAndDrag.load()
74 tapAndDragLock.load() 76​ tapAndDragLock.load()
75 multiTap.load() 77​ multiTap.load()
76 scrollMethod.load() 78​ scrollMethod.load()
77 naturalScroll.load() 79​ naturalScroll.load()
80​ scrollFactor.load()
78 rightClickMethod.load() 81​ rightClickMethod.load()
79 middleClickMethod.load() 82​ middleClickMethod.load()
80 disableHorizontalScrolling.load() 83​ disableHorizontalScrolling.load()
81 84​
82 loading = false 85​ loading = false
83 } 86​ }
84 87​
85 Kirigami.FormLayout { 88​ Kirigami.FormLayout {
▲ Show 20 Lines • Show All 505 Lines • ▼ Show 20 Line(s)577 Controls.CheckBox {
591 hoverEnabled: true 594​ hoverEnabled: true
592 Controls.ToolTip { 595​ Controls.ToolTip {
593 text: i18nd("kcm_touchpad", "Disable horizontal scrolling") 596​ text: i18nd("kcm_touchpad", "Disable horizontal scrolling")
594 visible: parent.hovered 597​ visible: parent.hovered
595 delay: 1000 598​ delay: 1000
596 } 599​ }
597 } 600​ }
598 601​
602​ // Scroll Speed aka scroll Factor
603​ Layouts.GridLayout {
604​ Kirigami.FormData.label: i18nd("kcm_touchpad", "Scroll speed:")
605​ Kirigami.FormData.buddyFor: scrollFactor
606​
607​ columns: 3
davidedmundsonUnsubmitted
Done

So I can only make it faster?

Is that sensible?

davidedmundson: So I can only make it faster? Is that sensible?
mevenAuthorUnsubmitted
Done

We can make it slower with a number between 0 and 1.
I will need to implement a custom step that's all.
I am also hesitant of making the steps exponential, rather than linear.

meven: We can make it slower with a number between 0 and 1. I will need to implement a custom step…
zzagUnsubmitted
Done

I suspect that a scroll factor less than 1 may screw up discrete axis values. Not sure whether it might be a problem, though.

zzag: I suspect that a scroll factor less than 1 may screw up discrete axis values. Not sure whether…
mevenAuthorUnsubmitted
Done

My testing went ok with a 0.1 scrollFactor, although not extensive (scroll in XWayland Firefox and in qtcreator Wayland mostly).

meven: My testing went ok with a 0.1 scrollFactor, although not extensive (scroll in XWayland Firefox…
608​
609​ Controls.Slider {
610​ id: scrollFactor
611​
612​ from: 0
613​ to: 14
614​ stepSize: 1
615​
davidedmundsonUnsubmitted
Done

Don't use onValueChanged

use onMoved

then you don't need all of this other logic

davidedmundson: Don't use onValueChanged use onMoved then you don't need all of this other logic
616​ property variant values : [
617​ 0.1,
618​ 0.3,
619​ 0.5,
620​ 0.75,
621​ 1, // default
622​ 1.5,
623​ 2,
624​ 3,
625​ 4,
626​ 5,
627​ 7,
628​ 9,
629​ 12,
630​ 15,
631​ 20];
ervinUnsubmitted
Done

Same comment applies than for mouse

ervin: Same comment applies than for mouse
632​
633​ Layouts.Layout.columnSpan: 3
634​
635​ function load() {
636​ let index = values.indexOf(device.touchpad)
637​ if (index === -1) {
638​ index = values.indexOf(1);
ervinUnsubmitted
Done

ditto

ervin: ditto
639​ }
640​ value = index;
641​ }
642​
643​ onMoved: {
644​ touchpad.scrollFactor = values[value];
ervinUnsubmitted
Done

ditto

ervin: ditto
645​ root.changeSignal()
646​ }
647​ }
648​
649​ //row 2
650​ Controls.Label {
651​ text: i18nc("Slower Scroll", "Slower")
652​ }
653​ Item {
654​ Layouts.Layout.fillWidth: true
655​ }
656​ Controls.Label {
657​ text: i18nc("Faster Scroll Speed", "Faster")
658​ }
659​ }
660​
599 Item { 661​ Item {
600 Kirigami.FormData.isSection: false 662​ Kirigami.FormData.isSection: false
601 } 663​ }
602 664​
603 Layouts.ColumnLayout { 665​ Layouts.ColumnLayout {
604 Kirigami.FormData.label: i18nd("kcm_touchpad", "Right-click:") 666​ Kirigami.FormData.label: i18nd("kcm_touchpad", "Right-click:")
605 Kirigami.FormData.buddyFor: rightClickMethodAreas 667​ Kirigami.FormData.buddyFor: rightClickMethodAreas
606 id: rightClickMethod 668​ id: rightClickMethod
▲ Show 20 Lines • Show All 138 Lines • Show Last 20 Lines