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

QGLWidget: Support retina framebuffer grabbing

Browse Source 
And update the opengl/grabber example.

Task-number: QTBUG-31173
Change-Id: If09f1f3634b353d034f51240fc68be6ee7aabb48
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
This commit is contained in:
Gabriel de Dietrich 2013-05-21 18:22:27 +02:00 committed by The Qt Project
parent 602bd98737
commit 004f25df78
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/opengl/grabber/mainwindow.cpp
View File

@ -175,7 +175,7 @@ QSlider *MainWindow::createSlider(const char *changedSignal,
void MainWindow::setPixmap(const QPixmap &pixmap) void MainWindow::setPixmap(const QPixmap &pixmap)
{ {
pixmapLabel->setPixmap(pixmap); pixmapLabel->setPixmap(pixmap);
QSize size = pixmap.size(); QSize size = pixmap.size() / pixmap.devicePixelRatio();
if (size - QSize(1, 0) == pixmapLabelArea->maximumViewportSize()) if (size - QSize(1, 0) == pixmapLabelArea->maximumViewportSize())
size -= QSize(1, 0); size -= QSize(1, 0);
pixmapLabel->resize(size); pixmapLabel->resize(size);

7
src/opengl/qgl.cpp
View File

@ -4090,11 +4090,12 @@ QImage QGLWidget::grabFrameBuffer(bool withAlpha)
{ {
makeCurrent(); makeCurrent();
QImage res; QImage res;
int w = width(); qreal pixelRatio = devicePixelRatio();
int h = height(); int w = pixelRatio * width();
int h = pixelRatio * height();
if (format().rgba()) if (format().rgba())
res = qt_gl_read_frame_buffer(QSize(w, h), format().alpha(), withAlpha); res = qt_gl_read_frame_buffer(QSize(w, h), format().alpha(), withAlpha);
res.setDevicePixelRatio(pixelRatio);
return res; return res;
} }