hrev52759 adds 1 changeset to branch 'master'
old head: 74726e7014a6df1bffe10166932a167895da52bb
new head: b3470a55cf580aad0168695a335619d1554574a0
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=b3470a55cf58+%5E74726e7014a6
----------------------------------------------------------------------------
b3470a55cf58: 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.
Change-Id: I37c68111f4a60408768656260bfc73a27f1f65f4
Reviewed-on: https://review.haiku-os.org/c/501
Reviewed-by: Stephan Aßmus <superstippi@xxxxxx>
[ JackBurton79 <stefano.ceccherini@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52759
Commit: b3470a55cf580aad0168695a335619d1554574a0
URL: https://git.haiku-os.org/haiku/commit/?id=b3470a55cf58
Author: JackBurton79 <stefano.ceccherini@xxxxxxxxx>
Date: Thu Aug 30 09:59:58 2018 UTC
Committer: Stephan Aßmus <superstippi@xxxxxx>
Commit-Date: Mon Jan 14 16:25:57 2019 UTC
----------------------------------------------------------------------------
2 files changed, 14 insertions(+), 14 deletions(-)
src/servers/app/ServerPicture.cpp | 26 +++++++++++++-------------
src/servers/app/ServerPicture.h | 2 +-
----------------------------------------------------------------------------
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());
-
- WriteSetHighColor(view->CurrentState()->HighColor());
- WriteSetLowColor(view->CurrentState()->LowColor());
+ 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(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);
