From 0822b88738e00625efd27ccca9119885272924d2 Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Mon, 26 Sep 2011 02:36:09 +0200 Subject: fixing bugs found during use ;) --- metawatch/metawatchpaintengine.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'metawatch/metawatchpaintengine.cpp') diff --git a/metawatch/metawatchpaintengine.cpp b/metawatch/metawatchpaintengine.cpp index 58a7b9d..1b449ab 100644 --- a/metawatch/metawatchpaintengine.cpp +++ b/metawatch/metawatchpaintengine.cpp @@ -3,24 +3,25 @@ using namespace sowatch; +const QRect MetaWatchPaintEngine::totalAreaRect(0, 0, MetaWatch::screenWidth, MetaWatch::screenHeight); + MetaWatchPaintEngine::MetaWatchPaintEngine(MetaWatch* watch) : - WatchPaintEngine(watch), _watch(watch), - _imageRect(0, 0, MetaWatch::screenWidth, MetaWatch::screenHeight) + WatchPaintEngine(), + _watch(watch) { } bool MetaWatchPaintEngine::begin(QPaintDevice *pdev) { - _damaged = QRegion(); _watch = static_cast(pdev); _mode = _watch->paintTargetMode(); - return _painter.begin(_watch->imageFor(_mode)); + return WatchPaintEngine::begin(_watch->imageFor(_mode)); } bool MetaWatchPaintEngine::end() { - bool ret = _painter.end(); + bool ret = WatchPaintEngine::end(); if (ret) { _watch->update(_mode, _damaged.rects().toList()); } @@ -94,7 +95,7 @@ void MetaWatchPaintEngine::updateState(const QPaintEngineState &state) bool MetaWatchPaintEngine::fillsEntireImage(const QRect& rect) { - return rect == _imageRect && + return rect == totalAreaRect && (!_clipEnabled || - (_clipRegion.numRects() == 1 && _clipRegion.rects().at(0) == _imageRect)); + (_clipRegion.numRects() == 1 && _clipRegion.rects().at(0) == totalAreaRect)); } -- cgit v1.2.3