Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWin
Commits
a4fb852a
Commit
a4fb852a
authored
Jan 12, 2021
by
Xaver Hugl
Committed by
Aleix Pol Gonzalez
Jan 18, 2021
Browse files
Replace per-device touch slot with global slot
With multiple touch devices the slots could interfere
parent
8bb5b274
Changes
2
Hide whitespace changes
Inline
Side-by-side
autotests/libinput/mock_libinput.cpp
View file @
a4fb852a
...
...
@@ -635,7 +635,7 @@ double libinput_event_touch_get_y_transformed(struct libinput_event_touch *event
return
event
->
absolutePos
.
y
()
/
deviceHeight
*
height
;
}
int32_t
libinput_event_touch_get_slot
(
struct
libinput_event_touch
*
event
)
int32_t
libinput_event_touch_get_
seat_
slot
(
struct
libinput_event_touch
*
event
)
{
return
event
->
slot
;
}
...
...
libinput/events.cpp
View file @
a4fb852a
...
...
@@ -263,7 +263,7 @@ qint32 TouchEvent::id() const
{
Q_ASSERT
(
type
()
!=
LIBINPUT_EVENT_TOUCH_CANCEL
&&
type
()
!=
LIBINPUT_EVENT_TOUCH_FRAME
);
const
qint32
slot
=
libinput_event_touch_get_slot
(
m_touchEvent
);
const
qint32
slot
=
libinput_event_touch_get_
seat_
slot
(
m_touchEvent
);
return
slot
==
-
1
?
0
:
slot
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment