Ticket #6415: draw_picture.patch

src/servers/app/ServerPicture.cpp

@@ -515 +515 @@
     ServerPicture* picture
         = view->Window()->ServerWindow()->App()->GetPicture(token);
     if (picture != NULL) {
-        BPoint origin = view->DrawingOrigin();
-        view->ConvertToScreenForDrawing(&where);
+        view->PushState();
         view->SetDrawingOrigin(where);
+
         view->PushState();
         picture->Play(view);
         view->PopState();
-        view->SetDrawingOrigin(origin);
+
+        view->PopState();
+
         picture->ReleaseReference();
     }
 }

src/servers/app/ServerWindow.cpp

@@ -2782 +2782 @@
             if (link.Read<BPoint>(&where) == B_OK) {
                 ServerPicture* picture = App()->GetPicture(token);
                 if (picture != NULL) {
-                    // Setting the drawing origin outside of the
-                    // state makes sure that everything the picture
-                    // does is relative to the global picture offset.
-                    BPoint origin = fCurrentView->DrawingOrigin();
-                    fCurrentView->ConvertToScreenForDrawing(&where);
+                    fCurrentView->PushState();
                     fCurrentView->SetDrawingOrigin(where);
 
                     fCurrentView->PushState();
                     picture->Play(fCurrentView);
                     fCurrentView->PopState();
 
-                    fCurrentView->SetDrawingOrigin(origin);
+                    fCurrentView->PopState();
 
                     picture->ReleaseReference();
                 }