From 8511f6ac9b4db63e490538fa7d0248ff0e0d5924 Mon Sep 17 00:00:00 2001 From: Julian Harnath Date: Wed, 8 Jul 2015 20:54:56 +0200 Subject: [PATCH] app_server: fix ServerPicture::SyncState pen size * Should use the unscaled pen size here because we also write down the current scale, and we don't want to scale the pen twice. --- src/servers/app/ServerPicture.cpp | 2 +- src/servers/app/ServerPicture.h | 2 ++ src/tests/servers/app/Jamfile | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp index d03ddb29e3..b59a61701a 100644 --- a/src/servers/app/ServerPicture.cpp +++ b/src/servers/app/ServerPicture.cpp @@ -978,7 +978,7 @@ ServerPicture::SyncState(View* view) WriteSetOrigin(view->CurrentState()->Origin()); WriteSetPenLocation(view->CurrentState()->PenLocation()); - WriteSetPenSize(view->CurrentState()->PenSize()); + WriteSetPenSize(view->CurrentState()->UnscaledPenSize()); WriteSetScale(view->CurrentState()->Scale()); WriteSetLineMode(view->CurrentState()->LineCapMode(), view->CurrentState()->LineJoinMode(), diff --git a/src/servers/app/ServerPicture.h b/src/servers/app/ServerPicture.h index f559b45b59..5b008e22d9 100644 --- a/src/servers/app/ServerPicture.h +++ b/src/servers/app/ServerPicture.h @@ -63,6 +63,8 @@ public: status_t ExportData(BPrivate::PortLink& link); private: + friend class PictureBoundingBoxPlayer; + typedef BObjectList PictureList; int32 fToken; diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile index f3e3ac340d..73d8b98009 100644 --- a/src/tests/servers/app/Jamfile +++ b/src/tests/servers/app/Jamfile @@ -156,6 +156,7 @@ SharedLibrary libtestappserver.so : DesktopSettings.cpp OffscreenServerWindow.cpp OffscreenWindow.cpp + PictureBoundingBoxPlayer.cpp RegionPool.cpp Screen.cpp ScreenConfigurations.cpp