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

Rename QPA ExposeEvent's window-pointer from 'exposed' to 'window'

Browse Source 
The former is easy to mistake for the isExposed state of the event.

Change-Id: Ic769ac332901ac97449ebc8dcca5959b6b42df68
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Tor Arne Vestbø 2016-09-21 15:15:22 +02:00 committed by Tor Arne Vestbø
parent e0254fdacc
commit 524b59b0f5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/kernel/qguiapplication.cpp
View File

@ -2794,10 +2794,10 @@ void QGuiApplicationPrivate::reportRefreshRateChange(QWindowSystemInterfacePriva
void QGuiApplicationPrivate::processExposeEvent(QWindowSystemInterfacePrivate::ExposeEvent *e)
{
if (!e->exposed)
if (!e->window)
return;
QWindow *window = e->exposed.data();
QWindow *window = e->window.data();
if (!window)
return;
QWindowPrivate *p = qt_window_private(window);

6
src/gui/kernel/qwindowsysteminterface.cpp
View File

@ -361,10 +361,10 @@ void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, con
}
QWindowSystemInterfacePrivate::ExposeEvent::ExposeEvent(QWindow *exposed, const QRegion &region)
QWindowSystemInterfacePrivate::ExposeEvent::ExposeEvent(QWindow *window, const QRegion &region)
: WindowSystemEvent(Expose)
, exposed(exposed)
, isExposed(exposed && exposed->handle() ? exposed->handle()->isExposed() : false)
, window(window)
, isExposed(window && window->handle() ? window->handle()->isExposed() : false)
, region(region)
{
}

4
src/gui/kernel/qwindowsysteminterface_p.h
View File

@ -330,8 +330,8 @@ public:
class ExposeEvent : public WindowSystemEvent {
public:
ExposeEvent(QWindow *exposed, const QRegion &region);
QPointer<QWindow> exposed;
ExposeEvent(QWindow *window, const QRegion &region);
QPointer<QWindow> window;
bool isExposed;
QRegion region;
};