qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure QQuickWidget and its offscreen window's screens are always in sync 

By default, the offscreen window is placed on the primary screen.
However, if the parent widget argument is passed to the QQuickWidget's
constructor, then QQuickWidget's and the offscreen window's screens can
be different and that can create rendering issues, e.g. blurry text if
the primary screen and QQuickWidget's screen have different scale
factors.

Change-Id: I10c62b5635664f943b11828773f14017f198a770
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Vlad Zahorodnii 2022-01-29 21:59:33 +02:00
parent 672df4cb17
commit a2a2734bff
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/quickwidgets/qquickwidget.cpp
View File

@ -187,6 +187,7 @@ void QQuickWidgetPrivate::initOffscreenWindow()
{
Q_Q(QQuickWidget);
offscreenWindow = new QQuickWidgetOffscreenWindow(*new QQuickWidgetOffscreenWindowPrivate(), renderControl);
offscreenWindow->setScreen(q->screen());
// Do not call create() on offscreenWindow.
QWidget::connect(offscreenWindow, SIGNAL(sceneGraphInitialized()), q, SLOT(createFramebufferObject()));
@ -1035,9 +1036,7 @@ void QQuickWidgetPrivate::createContext()
context = new QOpenGLContext;
context->setFormat(offscreenWindow->requestedFormat());
const QWindow *win = q->window()->windowHandle();
if (win && win->screen())
context->setScreen(win->screen());
context->setScreen(q->screen());
QOpenGLContext *shareContext = qt_gl_global_share_context();
if (!shareContext)
shareContext = QWidgetPrivate::get(q->window())->shareContext();
@ -1657,19 +1656,16 @@ bool QQuickWidget::event(QEvent *e)
d->handleWindowChange();
break;
case QEvent::ScreenChangeInternal:
if (QWindow *window = this->window()->windowHandle()) {
QScreen *newScreen = window->screen();
if (d->offscreenWindow)
d->offscreenWindow->setScreen(newScreen);
if (d->offscreenSurface)
d->offscreenSurface->setScreen(newScreen);
case QEvent::ScreenChangeInternal: {
QScreen *newScreen = screen();
if (d->offscreenWindow)
d->offscreenWindow->setScreen(newScreen);
if (d->offscreenSurface)
d->offscreenSurface->setScreen(newScreen);
#if QT_CONFIG(opengl)
if (d->context)
d->context->setScreen(newScreen);
if (d->context)
d->context->setScreen(newScreen);
#endif
}
if (d->useSoftwareRenderer
#if QT_CONFIG(opengl)
@ -1682,7 +1678,7 @@ bool QQuickWidget::event(QEvent *e)
d->render(true);
}
break;
}
case QEvent::Show:
case QEvent::Move:
d->updatePosition();