From b3470a55cf580aad0168695a335619d1554574a0 Mon Sep 17 00:00:00 2001 From: JackBurton79 Date: Thu, 30 Aug 2018 11:59:58 +0200 Subject: [PATCH] ServerPicture:SyncState(): sync with Canvas instead of View When the canvas api was introduced, ServerPicture was changed to work with Canvas,but this was not updated. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I37c68111f4a60408768656260bfc73a27f1f65f4 Reviewed-on: https://review.haiku-os.org/c/501 Reviewed-by: Stephan Aßmus --- src/servers/app/ServerPicture.cpp | 24 ++++++++++++------------ src/servers/app/ServerPicture.h | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp index b6bd20f769..4d99d17a97 100644 --- a/src/servers/app/ServerPicture.cpp +++ b/src/servers/app/ServerPicture.cpp @@ -1042,23 +1042,23 @@ ServerPicture::ExitStateChange() void -ServerPicture::SyncState(View* view) +ServerPicture::SyncState(Canvas* canvas) { // TODO: Finish this EnterStateChange(); - WriteSetOrigin(view->CurrentState()->Origin()); - WriteSetPenLocation(view->CurrentState()->PenLocation()); - WriteSetPenSize(view->CurrentState()->UnscaledPenSize()); - WriteSetScale(view->CurrentState()->Scale()); - WriteSetLineMode(view->CurrentState()->LineCapMode(), - view->CurrentState()->LineJoinMode(), - view->CurrentState()->MiterLimit()); - //WriteSetPattern(*view->CurrentState()->GetPattern().GetInt8()); - WriteSetDrawingMode(view->CurrentState()->GetDrawingMode()); + WriteSetOrigin(canvas->CurrentState()->Origin()); + WriteSetPenLocation(canvas->CurrentState()->PenLocation()); + WriteSetPenSize(canvas->CurrentState()->UnscaledPenSize()); + WriteSetScale(canvas->CurrentState()->Scale()); + WriteSetLineMode(canvas->CurrentState()->LineCapMode(), + canvas->CurrentState()->LineJoinMode(), + canvas->CurrentState()->MiterLimit()); + //WriteSetPattern(*canvas->CurrentState()->GetPattern().GetInt8()); + WriteSetDrawingMode(canvas->CurrentState()->GetDrawingMode()); - WriteSetHighColor(view->CurrentState()->HighColor()); - WriteSetLowColor(view->CurrentState()->LowColor()); + WriteSetHighColor(canvas->CurrentState()->HighColor()); + WriteSetLowColor(canvas->CurrentState()->LowColor()); ExitStateChange(); } diff --git a/src/servers/app/ServerPicture.h b/src/servers/app/ServerPicture.h index 603b8d777c..a8f8334a91 100644 --- a/src/servers/app/ServerPicture.h +++ b/src/servers/app/ServerPicture.h @@ -49,7 +49,7 @@ public: void EnterStateChange(); void ExitStateChange(); - void SyncState(View* view); + void SyncState(Canvas* canvas); void WriteFontState(const ServerFont& font, uint16 mask);