fix merge fix

This commit is contained in:
Thomas Lübking 2012-09-19 20:49:55 +02:00
parent 850c1e6f0d
commit f42f539102

View file

@ -407,8 +407,8 @@ void Scene::paintWindow(Window* w, int mask, QRegion region, WindowQuadList quad
x -= thumb->x(); x -= thumb->x();
y -= thumb->y(); y -= thumb->y();
// compensate shadow topleft padding // compensate shadow topleft padding
thumbData.xTranslate += (thumb->x()-visualThumbRect.x())*thumbData.xScale(); x += (thumb->x()-visualThumbRect.x())*thumbData.xScale();
thumbData.yTranslate += (thumb->y()-visualThumbRect.y())*thumbData.yScale(); y += (thumb->y()-visualThumbRect.y())*thumbData.yScale();
thumbData.setXTranslation(x); thumbData.setXTranslation(x);
thumbData.setYTranslation(y); thumbData.setYTranslation(y);
int thumbMask = PAINT_WINDOW_TRANSFORMED | PAINT_WINDOW_LANCZOS; int thumbMask = PAINT_WINDOW_TRANSFORMED | PAINT_WINDOW_LANCZOS;