git.iko.soy/unity8
on xenial help sign in
drop the ignoredMice hack again

the new inputinfo backend seems to be clever enough to not wrongly detect the hardware in there as real a real mouse Fixes: #1521580 Approved by: Daniel d'Andrada

commitba42b16d5058f37480ee3fd608c967c0a7b96fc0 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 8 Dec 2015, 15:37 (11 years ago) parentb0560e02c98ac2
2 files changed+2−7
compare with xenial
unifiedsplit
qml/DeviceConfiguration.qml−5 qml/OrientedShell.qml+2−2
qml/DeviceConfiguration.qml−5
@@ -34,8 +34,6 @@ QtObject {
3434
3535 readonly property alias category: priv.category
3636
37− readonly property alias ignoredMice: priv.ignoredMice
38−
3937 readonly property var priv: StateGroup {
4038 id: priv
4139
@@ -55,8 +53,6 @@ QtObject {
5553 // "phone", "tablet" or "desktop"
5654 property string category: "phone"
5755
58− property int ignoredMice: 0
59−
6056 states: [
6157 State {
6258 name: "mako"
@@ -83,7 +79,6 @@ QtObject {
8379 supportedOrientations: Qt.PortraitOrientation
8480 | Qt.LandscapeOrientation
8581 | Qt.InvertedLandscapeOrientation
86− ignoredMice: 1
8782 }
8883 },
8984 State {
qml/OrientedShell.qml+2−2
@@ -188,7 +188,7 @@ Rectangle {
188188 nativeWidth: root.width
189189 nativeHeight: root.height
190190 mode: applicationArguments.mode
191− hasMouse: miceModel.count + touchPadModel.count > deviceConfiguration.ignoredMice
191+ hasMouse: miceModel.count + touchPadModel.count > 0
192192
193193 // TODO: Factor in the connected input devices (eg: physical keyboard, mouse, touchscreen),
194194 // what's the output device (eg: big TV, desktop monitor, phone display), etc.
@@ -202,7 +202,7 @@ Rectangle {
202202 return "tablet";
203203 }
204204 } else { // automatic
205− if (miceModel.count + touchPadModel.count > deviceConfiguration.ignoredMice) {
205+ if (miceModel.count + touchPadModel.count > 0) {
206206 return "desktop";
207207 } else {
208208 return deviceConfiguration.category;