github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

QT_VERSION in hex, sigh

Browse source
This commit is contained in:
Philippe Teuwen 2020-09-22 11:51:29 +02:00
commit 6414e00f37
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/proxguiqt.cpp
View file

@ -687,7 +687,7 @@ void Plot::wheelEvent(QWheelEvent *event) {
const float zoom_offset = 0.1; const float zoom_offset = 0.1;
if (event->modifiers() & Qt::ShiftModifier) { if (event->modifiers() & Qt::ShiftModifier) {
// event->position doesn't exist in QT5.12.8, both exist in 5.14.2 and event->x doesn't exist in 5.15.0 // event->position doesn't exist in QT5.12.8, both exist in 5.14.2 and event->x doesn't exist in 5.15.0
#if QT_VERSION >= 0x051400 #if QT_VERSION >= 0x050d00
int x = event->position().x(); int x = event->position().x();
#else #else
int x = event->x(); int x = event->x();
@ -696,13 +696,13 @@ void Plot::wheelEvent(QWheelEvent *event) {
x = (int)(x / GraphPixelsPerPoint); x = (int)(x / GraphPixelsPerPoint);
x += GraphStart; x += GraphStart;
// event->angleDelta doesn't exist in QT4, both exist in 5.12.8 and 5.14.2 and event->delta doesn't exist in 5.15.0 // event->angleDelta doesn't exist in QT4, both exist in 5.12.8 and 5.14.2 and event->delta doesn't exist in 5.15.0
#if QT_VERSION >= 0x051400 #if QT_VERSION >= 0x050d00
Zoom(1.0-(float)event->angleDelta().y()/(120/zoom_offset), x); Zoom(1.0-(float)event->angleDelta().y()/(120/zoom_offset), x);
#else #else
Zoom(1.0-(float)event->delta()/(120/zoom_offset), x); Zoom(1.0-(float)event->delta()/(120/zoom_offset), x);
#endif #endif
} else { } else {
#if QT_VERSION >= 0x051400 #if QT_VERSION >= 0x050d00
Move(PageWidth*(-(float)event->angleDelta().y()/(120/move_offset))); Move(PageWidth*(-(float)event->angleDelta().y()/(120/move_offset)));
#else #else
Move(PageWidth*(-(float)event->delta()/(120/move_offset))); Move(PageWidth*(-(float)event->delta()/(120/move_offset)));