i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert the BPoint to screen coordinates respecting the scale

Browse Source 
(using ConvertToScreenForDrawing()) before drawing a BPicture, both directly
and inside another BPicture. Restore the drawing origin when drawing a nested
BPicture (like we already do when drawing it directly).
Fixes #6008.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37824 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2010-07-30 20:46:29 +00:00
parent 7d90a09a79
commit 568bdbf719
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/ServerPicture.cpp
+4 -2
View File
@@ -4,7 +4,7 @@
* *
* Authors: * Authors:
* Marc Flerackers ([email protected]) * Marc Flerackers ([email protected])
* Stefano Ceccherini ([email protected]) * Stefano Ceccherini ([email protected])
* Marcus Overhagen <[email protected]> * Marcus Overhagen <[email protected]>
*/ */
@@ -515,11 +515,13 @@ draw_picture(View* view, BPoint where, int32 token)
ServerPicture* picture ServerPicture* picture
= view->Window()->ServerWindow()->App()->GetPicture(token); = view->Window()->ServerWindow()->App()->GetPicture(token);
if (picture != NULL) { if (picture != NULL) {
BPoint origin = view->DrawingOrigin();
view->ConvertToScreenForDrawing(&where);
view->SetDrawingOrigin(where); view->SetDrawingOrigin(where);
view->PushState(); view->PushState();
picture->Play(view); picture->Play(view);
view->PopState(); view->PopState();
view->SetDrawingOrigin(origin);
picture->ReleaseReference(); picture->ReleaseReference();
} }
} }
src/servers/app/ServerWindow.cpp
+1
View File
@@ -2786,6 +2786,7 @@ ServerWindow::_DispatchViewDrawingMessage(int32 code,
// state makes sure that everything the picture // state makes sure that everything the picture
// does is relative to the global picture offset. // does is relative to the global picture offset.
BPoint origin = fCurrentView->DrawingOrigin(); BPoint origin = fCurrentView->DrawingOrigin();
fCurrentView->ConvertToScreenForDrawing(&where);
fCurrentView->SetDrawingOrigin(where); fCurrentView->SetDrawingOrigin(where);
fCurrentView->PushState(); fCurrentView->PushState();