From f42f539102c70309f08efeec9f4ffa92ed2b0ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Wed, 19 Sep 2012 20:49:55 +0200
Subject: [PATCH] fix merge fix

---
 scene.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scene.cpp b/scene.cpp
index 9fba2922f5..28136b6eb0 100644
--- a/scene.cpp
+++ b/scene.cpp
@@ -407,8 +407,8 @@ void Scene::paintWindow(Window* w, int mask, QRegion region, WindowQuadList quad
         x -= thumb->x();
         y -= thumb->y();
         // compensate shadow topleft padding
-        thumbData.xTranslate += (thumb->x()-visualThumbRect.x())*thumbData.xScale();
-        thumbData.yTranslate += (thumb->y()-visualThumbRect.y())*thumbData.yScale();
+        x += (thumb->x()-visualThumbRect.x())*thumbData.xScale();
+        y += (thumb->y()-visualThumbRect.y())*thumbData.yScale();
         thumbData.setXTranslation(x);
         thumbData.setYTranslation(y);
         int thumbMask = PAINT_WINDOW_TRANSFORMED | PAINT_WINDOW_LANCZOS;