From 7bc9f84556c1082139790127743a227a0dff523f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 3 Feb 2014 23:38:27 +0100 Subject: [PATCH] ClipToPicture test: Fixed nested states expected look. --- .../servers/app/clip_to_picture/main.cpp | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/tests/servers/app/clip_to_picture/main.cpp b/src/tests/servers/app/clip_to_picture/main.cpp index d044b92b4b..702704ca33 100644 --- a/src/tests/servers/app/clip_to_picture/main.cpp +++ b/src/tests/servers/app/clip_to_picture/main.cpp @@ -353,27 +353,27 @@ class Test3Validate : public TestRenderer { class Test4Clipping : public TestRenderer { virtual void Draw(BView* view, BRect updateRect) { - BPicture picture; - view->BeginPicture(&picture); view->SetDrawingMode(B_OP_ALPHA); view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_COMPOSITE); - view->DrawString("Clipping", BPoint(10, 15)); + + BPicture rect; + view->BeginPicture(&rect); + view->FillRect(BRect(20, 20, 50, 50)); view->EndPicture(); - view->ClipToPicture(&picture); + view->ClipToPicture(&rect); view->PushState(); - view->SetScale(2.0); - view->ClipToPicture(&picture); - - view->PushState(); - view->SetScale(2.0); - view->ClipToPicture(&picture); + BPicture circle; + view->BeginPicture(&circle); + view->FillEllipse(BRect(20, 20, 50, 50)); + view->EndPicture(); + + view->ClipToInversePicture(&circle); view->FillRect(view->Bounds()); view->PopState(); - view->PopState(); } }; @@ -381,12 +381,8 @@ class Test4Clipping : public TestRenderer { class Test4Validate : public TestRenderer { virtual void Draw(BView* view, BRect updateRect) { - view->SetDrawingMode(B_OP_OVER); - view->DrawString("Clipping", BPoint(10, 15)); - view->SetScale(2.0); - view->DrawString("Clipping", BPoint(10, 15)); - view->SetScale(4.0); - view->DrawString("Clipping", BPoint(10, 15)); + view->FillRect(BRect(20, 20, 50, 50)); + view->FillEllipse(BRect(20, 20, 50, 50), B_SOLID_LOW); } };