From 2671c0bf0a6fecf211b40e1267fd1fcaf7ce0e9c Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Sat, 4 Aug 2007 14:34:47 +0000 Subject: [PATCH] Since AS_DRAW_STRING doesn't attach the escapement delta anymore, drawing a string inside a picture and then playing that picture triggered a debugger call. Fixed. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21823 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/ServerWindow.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp index e0894f2fa1..4ba6abe6dc 100644 --- a/src/servers/app/ServerWindow.cpp +++ b/src/servers/app/ServerWindow.cpp @@ -2545,15 +2545,17 @@ ServerWindow::_DispatchPictureMessage(int32 code, BPrivate::LinkReceiver &link) } case AS_DRAW_STRING: + case AS_DRAW_STRING_WITH_DELTA: { char* string = NULL; int32 length; BPoint location; - escapement_delta delta; - + link.Read(&length); link.Read(&location); - link.Read(&delta); + escapement_delta delta = { 0, 0 }; + if (code == AS_DRAW_STRING_WITH_DELTA) + link.Read(&delta); link.ReadString(&string); picture->WriteDrawString(location, string, length, delta);