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 <[email protected]>
This commit is contained in:
committed by
Stephan Aßmus
parent
74726e7014
commit
b3470a55cf
@@ -1042,23 +1042,23 @@ ServerPicture::ExitStateChange()
|
|||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
ServerPicture::SyncState(View* view)
|
ServerPicture::SyncState(Canvas* canvas)
|
||||||
{
|
{
|
||||||
// TODO: Finish this
|
// TODO: Finish this
|
||||||
EnterStateChange();
|
EnterStateChange();
|
||||||
|
|
||||||
WriteSetOrigin(view->CurrentState()->Origin());
|
WriteSetOrigin(canvas->CurrentState()->Origin());
|
||||||
WriteSetPenLocation(view->CurrentState()->PenLocation());
|
WriteSetPenLocation(canvas->CurrentState()->PenLocation());
|
||||||
WriteSetPenSize(view->CurrentState()->UnscaledPenSize());
|
WriteSetPenSize(canvas->CurrentState()->UnscaledPenSize());
|
||||||
WriteSetScale(view->CurrentState()->Scale());
|
WriteSetScale(canvas->CurrentState()->Scale());
|
||||||
WriteSetLineMode(view->CurrentState()->LineCapMode(),
|
WriteSetLineMode(canvas->CurrentState()->LineCapMode(),
|
||||||
view->CurrentState()->LineJoinMode(),
|
canvas->CurrentState()->LineJoinMode(),
|
||||||
view->CurrentState()->MiterLimit());
|
canvas->CurrentState()->MiterLimit());
|
||||||
//WriteSetPattern(*view->CurrentState()->GetPattern().GetInt8());
|
//WriteSetPattern(*canvas->CurrentState()->GetPattern().GetInt8());
|
||||||
WriteSetDrawingMode(view->CurrentState()->GetDrawingMode());
|
WriteSetDrawingMode(canvas->CurrentState()->GetDrawingMode());
|
||||||
|
|
||||||
WriteSetHighColor(view->CurrentState()->HighColor());
|
WriteSetHighColor(canvas->CurrentState()->HighColor());
|
||||||
WriteSetLowColor(view->CurrentState()->LowColor());
|
WriteSetLowColor(canvas->CurrentState()->LowColor());
|
||||||
|
|
||||||
ExitStateChange();
|
ExitStateChange();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public:
|
|||||||
void EnterStateChange();
|
void EnterStateChange();
|
||||||
void ExitStateChange();
|
void ExitStateChange();
|
||||||
|
|
||||||
void SyncState(View* view);
|
void SyncState(Canvas* canvas);
|
||||||
void WriteFontState(const ServerFont& font,
|
void WriteFontState(const ServerFont& font,
|
||||||
uint16 mask);
|
uint16 mask);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user