whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

widgets: Merge QPlatformTextureListWatcher into implementation file 

Change-Id: Icf177a5b559bd1c108a66ee14a51fb23cd36e083
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Tor Arne Vestbø 2019-08-21 15:42:40 +02:00
parent 6a859f8112
commit 5bcfe771a5
2 changed files with 39 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/widgets/kernel/qwidgetrepaintmanager.cpp
View File

@ -69,6 +69,44 @@ QT_BEGIN_NAMESPACE
#ifndef QT_NO_OPENGL
Q_GLOBAL_STATIC(QPlatformTextureList, qt_dummy_platformTextureList)
// Watches one or more QPlatformTextureLists for changes in the lock state and
// triggers a backingstore sync when all the registered lists turn into
// unlocked state. This is essential when a custom composeAndFlush()
// implementation in a platform plugin is not synchronous and keeps
// holding on to the textures for some time even after returning from there.
class QPlatformTextureListWatcher : public QObject
{
Q_OBJECT
public:
QPlatformTextureListWatcher(QWidgetRepaintManager *repaintManager)
: m_repaintManager(repaintManager) {}
void watch(QPlatformTextureList *textureList) {
connect(textureList, SIGNAL(locked(bool)), SLOT(onLockStatusChanged(bool)));
m_locked[textureList] = textureList->isLocked();
}
bool isLocked() const {
foreach (bool v, m_locked) {
if (v)
return true;
}
return false;
}
private slots:
void onLockStatusChanged(bool locked) {
QPlatformTextureList *tl = static_cast<QPlatformTextureList *>(sender());
m_locked[tl] = locked;
if (!isLocked())
m_repaintManager->sync();
}
private:
QHash<QPlatformTextureList *, bool> m_locked;
QWidgetRepaintManager *m_repaintManager;
};
#endif
// ---------------------------------------------------------------------------
@ -656,39 +694,6 @@ static QPlatformTextureList *widgetTexturesFor(QWidget *tlw, QWidget *widget)
return 0;
}
// Watches one or more QPlatformTextureLists for changes in the lock state and
// triggers a backingstore sync when all the registered lists turn into
// unlocked state. This is essential when a custom composeAndFlush()
// implementation in a platform plugin is not synchronous and keeps
// holding on to the textures for some time even after returning from there.
QPlatformTextureListWatcher::QPlatformTextureListWatcher(QWidgetRepaintManager *paintManager)
: m_repaintManager(paintManager)
{
}
void QPlatformTextureListWatcher::watch(QPlatformTextureList *textureList)
{
connect(textureList, SIGNAL(locked(bool)), SLOT(onLockStatusChanged(bool)));
m_locked[textureList] = textureList->isLocked();
}
bool QPlatformTextureListWatcher::isLocked() const
{
foreach (bool v, m_locked) {
if (v)
return true;
}
return false;
}
void QPlatformTextureListWatcher::onLockStatusChanged(bool locked)
{
QPlatformTextureList *tl = static_cast<QPlatformTextureList *>(sender());
m_locked[tl] = locked;
if (!isLocked())
m_repaintManager->sync();
}
#else
static QPlatformTextureList *widgetTexturesFor(QWidget *tlw, QWidget *widget)
@ -1445,4 +1450,4 @@ void QWidgetPrivate::invalidateBackingStore_resizeHelper(const QPoint &oldPos, c
QT_END_NAMESPACE
#include "moc_qwidgetrepaintmanager_p.cpp"
#include "qwidgetrepaintmanager.moc"

19
src/widgets/kernel/qwidgetrepaintmanager_p.h
View File

@ -63,25 +63,6 @@ class QPlatformTextureList;
class QPlatformTextureListWatcher;
class QWidgetRepaintManager;
#ifndef QT_NO_OPENGL
class QPlatformTextureListWatcher : public QObject
{
Q_OBJECT
public:
QPlatformTextureListWatcher(QWidgetRepaintManager *repaintManager);
void watch(QPlatformTextureList *textureList);
bool isLocked() const;
private slots:
void onLockStatusChanged(bool locked);
private:
QHash<QPlatformTextureList *, bool> m_locked;
QWidgetRepaintManager *m_repaintManager;
};
#endif
class Q_AUTOTEST_EXPORT QWidgetRepaintManager
{
public: