AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use requestUpdate in QOpenGL and RasterWindow

Browse Source 
Change-Id: Ibed4b8d2e2185f1bcf3430932701f81577b59408
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
This commit is contained in:
Laszlo Agocs 2014-10-03 13:05:42 +02:00
parent 1f040d401d
commit 7069ebd1f6
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/kernel/qpaintdevicewindow.cpp
View File

@ -76,7 +76,7 @@ void QPaintDeviceWindow::update(const QRect &rect)
{ {
Q_D(QPaintDeviceWindow); Q_D(QPaintDeviceWindow);
d->dirtyRegion += rect; d->dirtyRegion += rect;
d->triggerUpdate(); requestUpdate();
} }
/*! /*!
@ -89,7 +89,7 @@ void QPaintDeviceWindow::update(const QRegion &region)
{ {
Q_D(QPaintDeviceWindow); Q_D(QPaintDeviceWindow);
d->dirtyRegion += region; d->dirtyRegion += region;
d->triggerUpdate(); requestUpdate();
} }
/*! /*!
@ -179,7 +179,6 @@ bool QPaintDeviceWindow::event(QEvent *event)
Q_D(QPaintDeviceWindow); Q_D(QPaintDeviceWindow);
if (event->type() == QEvent::UpdateRequest) { if (event->type() == QEvent::UpdateRequest) {
d->paintEventSent = false;
if (handle()) // platform window may be gone when the window is closed during app exit if (handle()) // platform window may be gone when the window is closed during app exit
d->handleUpdateEvent(); d->handleUpdateEvent();
return true; return true;

12
src/gui/kernel/qpaintdevicewindow_p.h
View File

@ -46,8 +46,6 @@ class Q_GUI_EXPORT QPaintDeviceWindowPrivate : public QWindowPrivate
Q_DECLARE_PUBLIC(QPaintDeviceWindow) Q_DECLARE_PUBLIC(QPaintDeviceWindow)
public: public:
QPaintDeviceWindowPrivate() : paintEventSent(false) { }
virtual void beginPaint(const QRegion &region) virtual void beginPaint(const QRegion &region)
{ {
Q_UNUSED(region); Q_UNUSED(region);
@ -82,15 +80,6 @@ public:
return true; return true;
} }
void triggerUpdate()
{
Q_Q(QPaintDeviceWindow);
if (!paintEventSent) {
QCoreApplication::postEvent(q, new QEvent(QEvent::UpdateRequest));
paintEventSent = true;
}
}
void doFlush(const QRegion &region) void doFlush(const QRegion &region)
{ {
QRegion toFlush = region; QRegion toFlush = region;
@ -113,7 +102,6 @@ public:
private: private:
QRegion dirtyRegion; QRegion dirtyRegion;
bool paintEventSent;
}; };