remove references to qws from backingstore
The backingstore code is already hard to read as-is. Let's simplify things by removing qws code. Change-Id: Ibefd3ea17d29970d1f7348461959fdc5b01c1f42 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
parent
93c960876a
commit
e583ce4103
@ -57,11 +57,6 @@
|
||||
#include <private/qpaintengine_raster_p.h>
|
||||
#include <private/qgraphicseffect_p.h>
|
||||
|
||||
#ifdef Q_WS_QWS
|
||||
#include <QtGui/qwsmanager_qws.h>
|
||||
#include <private/qwsmanager_p.h>
|
||||
#endif
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
extern QRegion qt_dirtyRegion(QWidget *);
|
||||
@ -153,13 +148,6 @@ static void showYellowThing_win(QWidget *widget, const QRegion ®ion, int msec
|
||||
|
||||
void QWidgetBackingStore::showYellowThing(QWidget *widget, const QRegion &toBePainted, int msec, bool unclipped)
|
||||
{
|
||||
#ifdef Q_WS_QWS
|
||||
Q_UNUSED(widget);
|
||||
Q_UNUSED(unclipped);
|
||||
static QWSYellowSurface surface(true);
|
||||
surface.setDelay(msec);
|
||||
surface.flush(widget, toBePainted, QPoint());
|
||||
#else
|
||||
QRegion paintRegion = toBePainted;
|
||||
QRect widgetRect = widget->rect();
|
||||
|
||||
@ -224,7 +212,6 @@ void QWidgetBackingStore::showYellowThing(QWidget *widget, const QRegion &toBePa
|
||||
::usleep(1000 * msec);
|
||||
#endif
|
||||
#endif // Q_WS_WIN
|
||||
#endif // Q_WS_QWS
|
||||
}
|
||||
|
||||
bool QWidgetBackingStore::flushPaint(QWidget *widget, const QRegion &rgn)
|
||||
@ -633,7 +620,7 @@ void QWidgetBackingStore::markDirtyOnScreen(const QRegion ®ion, QWidget *widg
|
||||
if (!widget || widget->d_func()->paintOnScreen() || region.isEmpty())
|
||||
return;
|
||||
|
||||
#if defined(Q_WS_QWS) || defined(Q_WS_MAC)
|
||||
#if defined(Q_WS_MAC)
|
||||
if (!widget->testAttribute(Qt::WA_WState_InPaintEvent))
|
||||
dirtyOnScreen += region.translated(topLevelOffset);
|
||||
return;
|
||||
@ -751,11 +738,6 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
|
||||
QPoint toplevelOffset = pw->mapTo(tlw, QPoint());
|
||||
QWidgetPrivate *pd = pw->d_func();
|
||||
QRect clipR(pd->clipRect());
|
||||
#ifdef Q_WS_QWS
|
||||
QWidgetBackingStore *wbs = x->backingStore.data();
|
||||
QWSWindowSurface *surface = static_cast<QWSWindowSurface*>(wbs->windowSurface);
|
||||
clipR = clipR.intersected(surface->clipRegion().translated(-toplevelOffset).boundingRect());
|
||||
#endif
|
||||
const QRect newRect(rect.translated(dx, dy));
|
||||
QRect destRect = rect.intersected(clipR);
|
||||
if (destRect.isValid())
|
||||
@ -839,26 +821,6 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
|
||||
bool accelerateScroll = accelEnv && isOpaque
|
||||
&& !(overlapped = isOverlapped(scrollRect.translated(data.crect.topLeft())));
|
||||
|
||||
#if defined(Q_WS_QWS)
|
||||
QWSWindowSurface *surface;
|
||||
surface = static_cast<QWSWindowSurface*>(wbs->windowSurface);
|
||||
|
||||
if (accelerateScroll && !surface->isBuffered()) {
|
||||
const QRegion surfaceClip = surface->clipRegion();
|
||||
const QRegion outsideClip = QRegion(rect) - surfaceClip;
|
||||
if (!outsideClip.isEmpty()) {
|
||||
const QVector<QRect> clipped = (surfaceClip & rect).rects();
|
||||
if (clipped.size() < 8) {
|
||||
for (int i = 0; i < clipped.size(); ++i)
|
||||
this->scrollRect(clipped.at(i), dx, dy);
|
||||
return;
|
||||
} else {
|
||||
accelerateScroll = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // Q_WS_QWS
|
||||
|
||||
if (!accelerateScroll) {
|
||||
if (overlapped) {
|
||||
QRegion region(scrollRect);
|
||||
@ -869,12 +831,6 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
|
||||
}
|
||||
} else {
|
||||
const QPoint toplevelOffset = q->mapTo(tlw, QPoint());
|
||||
#ifdef Q_WS_QWS
|
||||
QWSWindowSurface *surface = static_cast<QWSWindowSurface*>(wbs->windowSurface);
|
||||
const QRegion clip = surface->clipRegion().translated(-toplevelOffset) & scrollRect;
|
||||
const QRect clipBoundingRect = clip.boundingRect();
|
||||
scrollRect &= clipBoundingRect;
|
||||
#endif
|
||||
const QRect destRect = scrollRect.translated(dx, dy) & scrollRect;
|
||||
const QRect sourceRect = destRect.translated(-dx, -dy);
|
||||
|
||||
|
@ -87,9 +87,6 @@ public:
|
||||
{
|
||||
return !(dirtyWidgets.isEmpty() && dirty.isEmpty() && !hasDirtyFromPreviousSync
|
||||
&& !fullUpdatePending
|
||||
#if defined(Q_WS_QWS) && !defined(QT_NO_QWS_MANAGER)
|
||||
&& !hasDirtyWindowDecoration()
|
||||
#endif
|
||||
);
|
||||
}
|
||||
|
||||
@ -130,10 +127,6 @@ private:
|
||||
|
||||
void removeDirtyWidget(QWidget *w);
|
||||
|
||||
#if defined(Q_WS_QWS) && !defined(QT_NO_QWS_MANAGER)
|
||||
bool hasDirtyWindowDecoration() const;
|
||||
void paintWindowDecoration();
|
||||
#endif
|
||||
void updateLists(QWidget *widget);
|
||||
|
||||
inline void addDirtyWidget(QWidget *widget, const QRegion &rgn)
|
||||
@ -199,11 +192,7 @@ private:
|
||||
|
||||
inline QRect topLevelRect() const
|
||||
{
|
||||
#ifdef Q_WS_QWS
|
||||
return tlw->frameGeometry();
|
||||
#else
|
||||
return tlw->data->crect;
|
||||
#endif
|
||||
}
|
||||
|
||||
inline void appendDirtyOnScreenWidget(QWidget *widget)
|
||||
|
Loading…
Reference in New Issue
Block a user