Changeset View
Changeset View
Standalone View
Standalone View
kcms/touchpad/src/backends/kwin_wayland/kwinwaylandtouchpad.cpp
Show First 20 Lines • Show All 96 Lines • ▼ Show 20 Line(s) | 50 | { | |||
---|---|---|---|---|---|
97 | success &= valueLoader(m_scrollOnButtonDownEnabledByDefault); | 97 | success &= valueLoader(m_scrollOnButtonDownEnabledByDefault); | ||
98 | success &= valueLoader(m_defaultScrollButton); | 98 | success &= valueLoader(m_defaultScrollButton); | ||
99 | // current scrolling mode | 99 | // current scrolling mode | ||
100 | success &= valueLoader(m_naturalScroll); | 100 | success &= valueLoader(m_naturalScroll); | ||
101 | success &= valueLoader(m_isScrollTwoFinger); | 101 | success &= valueLoader(m_isScrollTwoFinger); | ||
102 | success &= valueLoader(m_isScrollEdge); | 102 | success &= valueLoader(m_isScrollEdge); | ||
103 | success &= valueLoader(m_isScrollOnButtonDown); | 103 | success &= valueLoader(m_isScrollOnButtonDown); | ||
104 | success &= valueLoader(m_scrollButton); | 104 | success &= valueLoader(m_scrollButton); | ||
105 | // scroll speed | ||||
106 | success &= valueLoader(m_scrollFactor); | ||||
105 | // click methods | 107 | // click methods | ||
106 | success &= valueLoader(m_supportsClickMethodAreas); | 108 | success &= valueLoader(m_supportsClickMethodAreas); | ||
107 | success &= valueLoader(m_supportsClickMethodClickfinger); | 109 | success &= valueLoader(m_supportsClickMethodClickfinger); | ||
108 | success &= valueLoader(m_defaultClickMethodAreas); | 110 | success &= valueLoader(m_defaultClickMethodAreas); | ||
109 | success &= valueLoader(m_defaultClickMethodClickfinger); | 111 | success &= valueLoader(m_defaultClickMethodClickfinger); | ||
110 | success &= valueLoader(m_clickMethodAreas); | 112 | success &= valueLoader(m_clickMethodAreas); | ||
111 | success &= valueLoader(m_clickMethodClickfinger); | 113 | success &= valueLoader(m_clickMethodClickfinger); | ||
112 | 114 | | |||
Show All 18 Lines | 119 | { | |||
131 | 133 | | |||
132 | m_naturalScroll.set(m_naturalScrollEnabledByDefault); | 134 | m_naturalScroll.set(m_naturalScrollEnabledByDefault); | ||
133 | m_isScrollTwoFinger.set(m_scrollTwoFingerEnabledByDefault); | 135 | m_isScrollTwoFinger.set(m_scrollTwoFingerEnabledByDefault); | ||
134 | m_isScrollEdge.set(m_scrollEdgeEnabledByDefault); | 136 | m_isScrollEdge.set(m_scrollEdgeEnabledByDefault); | ||
135 | m_isScrollOnButtonDown.set(m_scrollOnButtonDownEnabledByDefault); | 137 | m_isScrollOnButtonDown.set(m_scrollOnButtonDownEnabledByDefault); | ||
136 | 138 | | |||
137 | m_clickMethodAreas.set(m_defaultClickMethodAreas); | 139 | m_clickMethodAreas.set(m_defaultClickMethodAreas); | ||
138 | m_clickMethodClickfinger.set(m_defaultClickMethodClickfinger); | 140 | m_clickMethodClickfinger.set(m_defaultClickMethodClickfinger); | ||
141 | m_scrollFactor.set(1.0); | ||||
139 | 142 | | |||
140 | return true; | 143 | return true; | ||
141 | } | 144 | } | ||
142 | 145 | | |||
143 | bool KWinWaylandTouchpad::applyConfig() | 146 | bool KWinWaylandTouchpad::applyConfig() | ||
144 | { | 147 | { | ||
145 | QVector<QString> msgs; | 148 | QVector<QString> msgs; | ||
146 | 149 | | |||
Show All 11 Lines | 150 | msgs << valueWriter(m_enabled) | |||
158 | << valueWriter(m_tapDragLock) | 161 | << valueWriter(m_tapDragLock) | ||
159 | << valueWriter(m_lmrTapButtonMap) | 162 | << valueWriter(m_lmrTapButtonMap) | ||
160 | 163 | | |||
161 | << valueWriter(m_naturalScroll) | 164 | << valueWriter(m_naturalScroll) | ||
162 | << valueWriter(m_isScrollTwoFinger) | 165 | << valueWriter(m_isScrollTwoFinger) | ||
163 | << valueWriter(m_isScrollEdge) | 166 | << valueWriter(m_isScrollEdge) | ||
164 | << valueWriter(m_isScrollOnButtonDown) | 167 | << valueWriter(m_isScrollOnButtonDown) | ||
165 | << valueWriter(m_scrollButton) | 168 | << valueWriter(m_scrollButton) | ||
169 | << valueWriter(m_scrollFactor) | ||||
166 | 170 | | |||
167 | << valueWriter(m_clickMethodAreas) | 171 | << valueWriter(m_clickMethodAreas) | ||
168 | << valueWriter(m_clickMethodClickfinger); | 172 | << valueWriter(m_clickMethodClickfinger); | ||
169 | 173 | | |||
170 | bool success = true; | 174 | bool success = true; | ||
171 | QString error_msg; | 175 | QString error_msg; | ||
172 | 176 | | |||
173 | for (QString m : msgs) { | 177 | for (QString m : msgs) { | ||
Show All 25 Lines | 196 | return m_enabled.changed() || | |||
199 | m_tapToClick.changed() || | 203 | m_tapToClick.changed() || | ||
200 | m_tapAndDrag.changed() || | 204 | m_tapAndDrag.changed() || | ||
201 | m_tapDragLock.changed() || | 205 | m_tapDragLock.changed() || | ||
202 | m_lmrTapButtonMap.changed() || | 206 | m_lmrTapButtonMap.changed() || | ||
203 | m_naturalScroll.changed() || | 207 | m_naturalScroll.changed() || | ||
204 | m_isScrollTwoFinger.changed() || | 208 | m_isScrollTwoFinger.changed() || | ||
205 | m_isScrollEdge.changed() || | 209 | m_isScrollEdge.changed() || | ||
206 | m_isScrollOnButtonDown.changed() || | 210 | m_isScrollOnButtonDown.changed() || | ||
211 | m_scrollFactor.changed() || | ||||
207 | m_scrollButton.changed() || | 212 | m_scrollButton.changed() || | ||
208 | m_clickMethodAreas.changed() || | 213 | m_clickMethodAreas.changed() || | ||
209 | m_clickMethodClickfinger.changed(); | 214 | m_clickMethodClickfinger.changed(); | ||
210 | } | 215 | } | ||
211 | 216 | | |||
212 | template<typename T> | 217 | template<typename T> | ||
213 | QString KWinWaylandTouchpad::valueWriter(const Prop<T> &prop) | 218 | QString KWinWaylandTouchpad::valueWriter(const Prop<T> &prop) | ||
214 | { | 219 | { | ||
Show All 29 Lines |