mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-20 05:54:39 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug in flow_gl when a devicePixelRatio <> 1 was used

Browse Source
This commit is contained in:
Luis Ángel San Martín
2015-05-25 17:38:27 +02:00
parent 401c1ab1d9
commit d2de64d51a
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/gl/yacreader_flow_gl.cpp
View File

@ -368,7 +368,8 @@ void YACReaderFlowGL::resizeGL(int width, int height)
void YACReaderFlowGL::udpatePerspective(int width, int height) void YACReaderFlowGL::udpatePerspective(int width, int height)
{ {
glViewport(0, 0, width, height); float pixelRatio = devicePixelRatio();
glViewport(0, 0, width*pixelRatio, height*pixelRatio);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
@ -1101,8 +1102,9 @@ void YACReaderFlowGL::mousePressEvent(QMouseEvent *event)
if(event->button() == Qt::LeftButton) if(event->button() == Qt::LeftButton)
{ {
float x,y; float x,y;
x = event->x(); float pixelRatio = devicePixelRatio();
y = event->y(); x = event->x()*pixelRatio;
y = event->y()*pixelRatio;
GLint viewport[4]; GLint viewport[4];
GLdouble modelview[16]; GLdouble modelview[16];
GLdouble projection[16]; GLdouble projection[16];
@ -1139,8 +1141,9 @@ void YACReaderFlowGL::mouseDoubleClickEvent(QMouseEvent* event)
{ {
makeCurrent(); makeCurrent();
float x,y; float x,y;
x = event->x(); float pixelRatio = devicePixelRatio();
y = event->y(); x = event->x()*pixelRatio;
y = event->y()*pixelRatio;
GLint viewport[4]; GLint viewport[4];
GLdouble modelview[16]; GLdouble modelview[16];
GLdouble projection[16]; GLdouble projection[16];

13
common/gl_legacy/yacreader_flow_gl.cpp
View File

@ -339,7 +339,8 @@ void YACReaderFlowGL::resizeGL(int width, int height)
void YACReaderFlowGL::udpatePerspective(int width, int height) void YACReaderFlowGL::udpatePerspective(int width, int height)
{ {
glViewport(0, 0, width, height); float pixelRatio = devicePixelRatio();
glViewport(0, 0, width*pixelRatio, height*pixelRatio);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
@ -1078,8 +1079,9 @@ void YACReaderFlowGL::mousePressEvent(QMouseEvent *event)
if(event->button() == Qt::LeftButton) if(event->button() == Qt::LeftButton)
{ {
float x,y; float x,y;
x = event->x(); float pixelRatio = devicePixelRatio();
y = event->y(); x = event->x()*pixelRatio;
y = event->y()*pixelRatio;
GLint viewport[4]; GLint viewport[4];
GLdouble modelview[16]; GLdouble modelview[16];
GLdouble projection[16]; GLdouble projection[16];
@ -1113,8 +1115,9 @@ void YACReaderFlowGL::mousePressEvent(QMouseEvent *event)
void YACReaderFlowGL::mouseDoubleClickEvent(QMouseEvent* event) void YACReaderFlowGL::mouseDoubleClickEvent(QMouseEvent* event)
{ {
float x,y; float x,y;
x = event->x(); float pixelRatio = devicePixelRatio();
y = event->y(); x = event->x()*pixelRatio;
y = event->y()*pixelRatio;
GLint viewport[4]; GLint viewport[4];
GLdouble modelview[16]; GLdouble modelview[16];
GLdouble projection[16]; GLdouble projection[16];