1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tslib plugin: also apply missing release coordinate code to non-raw mode

Browse Source 
Even if the normal mode is used the release events may have zero coordinates.

Change-Id: I2eac8cf50dfcf9e62d8cec2423419a6579266849
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Rolf Eike Beer 2014-03-06 11:10:44 +01:00 committed by The Qt Project
parent 82288308ec
commit 9ba7cc07db
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/generic/tslib/qtslib.cpp
View File

@ -110,12 +110,17 @@ static bool get_sample(struct tsdev *dev, struct ts_sample *sample, bool rawMode
void QTsLibMouseHandler::readMouseData() void QTsLibMouseHandler::readMouseData()
{ {
ts_sample sample; ts_sample sample;
while (get_sample(m_dev, &sample, m_rawMode)) {
while (get_sample(m_dev, &sample, m_rawMode)) {
bool pressed = sample.pressure; bool pressed = sample.pressure;
int x = sample.x; int x = sample.x;
int y = sample.y; int y = sample.y;
// work around missing coordinates on mouse release
if (sample.pressure == 0 && sample.x == 0 && sample.y == 0) {
x = m_x;
y = m_y;
}
if (!m_rawMode) { if (!m_rawMode) {
//filtering: ignore movements of 2 pixels or less //filtering: ignore movements of 2 pixels or less
@ -123,12 +128,6 @@ void QTsLibMouseHandler::readMouseData()
int dy = y - m_y; int dy = y - m_y;
if (dx*dx <= 4 && dy*dy <= 4 && pressed == m_pressed) if (dx*dx <= 4 && dy*dy <= 4 && pressed == m_pressed)
continue; continue;
} else {
// work around missing coordinates on mouse release in raw mode
if (sample.pressure == 0 && sample.x == 0 && sample.y == 0) {
x = m_x;
y = m_y;
}
} }
QPoint pos(x, y); QPoint pos(x, y);