Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/dbackingstoreproxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,16 @@ void DBackingStoreProxy::composeAndFlush(QWindow *window, const QRegion &region,
{
m_proxy->composeAndFlush(window, region, offset, textures, translucentBackground);
}
#else
#elif QT_VERSION < QT_VERSION_CHECK(6, 9, 2)
QPlatformBackingStore::FlushResult DBackingStoreProxy::rhiFlush(QWindow *window, qreal sourceDevicePixelRatio, const QRegion &region, const QPoint &offset, QPlatformTextureList *textures, bool translucentBackground)
{
return m_proxy->rhiFlush(window, sourceDevicePixelRatio, region, offset, textures, translucentBackground);
}
#else
QPlatformBackingStore::FlushResult DBackingStoreProxy::rhiFlush(QWindow *window, qreal sourceDevicePixelRatio, const QRegion &region, const QPoint &offset, QPlatformTextureList *textures, bool translucentBackground, qreal sourceTransformFactor)
{
return m_proxy->rhiFlush(window, sourceDevicePixelRatio, region, offset, textures, translucentBackground, sourceTransformFactor);
}
#endif

#if QT_VERSION <= QT_VERSION_CHECK(6, 2, 4)
Expand Down
6 changes: 5 additions & 1 deletion src/dbackingstoreproxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ class DBackingStoreProxy : public QPlatformBackingStore
void composeAndFlush(QWindow *window, const QRegion &region, const QPoint &offset,
QPlatformTextureList *textures,
bool translucentBackground) override;
#else
#elif QT_VERSION < QT_VERSION_CHECK(6, 9, 2)
FlushResult rhiFlush(QWindow *window, qreal sourceDevicePixelRatio, const QRegion &region,
const QPoint &offset, QPlatformTextureList *textures,
bool translucentBackground) override;
#else
FlushResult rhiFlush(QWindow *window, qreal sourceDevicePixelRatio, const QRegion &region,
const QPoint &offset, QPlatformTextureList *textures,
bool translucentBackground, qreal sourceTransformFactor = 0) override;
#endif
#if QT_VERSION <= QT_VERSION_CHECK(6, 2, 4)
GLuint toTexture(const QRegion &dirtyRegion, QSize *textureSize, TextureFlags *flags) const override;
Expand Down
7 changes: 7 additions & 0 deletions wayland/dwayland/dhighdpi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,14 @@ void DHighDpi::removeScreenFactorCache(QScreen *screen)
// qDebug()<<window->devicePixelRatio();
// 更新窗口大小
if (window->handle()) {
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 2)
QWindowSystemInterfacePrivate::GeometryChangeEvent gce(window, QHighDpi::fromNativePixels(window->handle()->geometry(), window));
#else
QWindowSystemInterfacePrivate::GeometryChangeEvent gce(window,
QHighDpi::fromNativeWindowGeometry(window->handle()->geometry(), window),
QHighDpi::fromNativePixels(window->handle()->geometry(), window));
#endif

QGuiApplicationPrivate::processGeometryChangeEvent(&gce);
}
}
Expand Down
6 changes: 6 additions & 0 deletions xcb/dhighdpi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,13 @@ void DHighDpi::onDPIChanged(xcb_connection_t *connection, const QByteArray &name

// 更新窗口大小
if (window->handle()) {
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 2)
QWindowSystemInterfacePrivate::GeometryChangeEvent gce(window, QHighDpi::fromNativePixels(window->handle()->geometry(), window));
#else
QWindowSystemInterfacePrivate::GeometryChangeEvent gce(window,
QHighDpi::fromNativeWindowGeometry(window->handle()->geometry(), window),
QHighDpi::fromNativePixels(window->handle()->geometry(), window));
#endif
QGuiApplicationPrivate::processGeometryChangeEvent(&gce);
}
}
Expand Down
Loading