Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added testDrawScaledPicture which exposes a bug

Browse Source 
drawing a scaled picture at an offset. The offset
  needs to be scaled too, but isn't right now.
* Fixed testDrawLargeBitmap. The bounds were negative.
* Added testFontRotation. Works fine.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37818 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer 2010-07-30 09:12:57 +00:00
parent 6829d4174b
commit 8247141f14
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
View File

@ -8,6 +8,8 @@
#include "PictureTestCases.h" #include "PictureTestCases.h"
#include <stdio.h>
static const rgb_color kBlack = {0, 0, 0}; static const rgb_color kBlack = {0, 0, 0};
static const rgb_color kWhite = {255, 255, 255}; static const rgb_color kWhite = {255, 255, 255};
static const rgb_color kRed = {255, 0, 0}; static const rgb_color kRed = {255, 0, 0};
@ -292,6 +294,23 @@ static void testAppendToPicture(BView *view, BRect frame)
delete picture; delete picture;
} }
static void testDrawScaledPicture(BView* view, BRect frame)
{
view->BeginPicture(new BPicture());
view->FillRect(BRect(0, 0, 15, 15));
BPicture* picture = view->EndPicture();
// first unscaled at left, top
view->DrawPicture(picture, BPoint(2, 2));
// draw scaled at middle top
view->SetScale(0.5);
// the drawing offset must be scaled too!
view->DrawPicture(picture, BPoint(frame.Width(), 2));
delete picture;
}
static void testLineArray(BView *view, BRect frame) static void testLineArray(BView *view, BRect frame)
{ {
frame.InsetBy(2, 2); frame.InsetBy(2, 2);
@ -373,8 +392,8 @@ static void testDrawBitmapAtRect(BView *view, BRect frame) {
static void testDrawLargeBitmap(BView *view, BRect frame) { static void testDrawLargeBitmap(BView *view, BRect frame) {
BRect bounds(frame); BRect bounds(frame);
bounds.OffsetTo(0, 0); bounds.OffsetTo(0, 0);
bounds.left = 1024; bounds.right *= 4;
bounds.bottom = 767; bounds.bottom *= 4;
BBitmap bitmap(bounds, B_RGBA32); BBitmap bitmap(bounds, B_RGBA32);
fillBitmap(bitmap); fillBitmap(bitmap);
frame.InsetBy(2, 2); frame.InsetBy(2, 2);
@ -724,6 +743,19 @@ static void testPushPopState(BView *view, BRect frame)
view->FillRect(frame, B_SOLID_HIGH); view->FillRect(frame, B_SOLID_HIGH);
} }
static void testFontRotation(BView* view, BRect frame)
{
BFont font;
view->GetFont(&font);
font.SetRotation(90);
view->SetFont(&font, B_FONT_ROTATION);
view->DrawString("This is a test!", BPoint(frame.Width() / 2, frame.bottom - 3));
view->GetFont(&font);
if (font.Rotation() != 90.0)
fprintf(stderr, "Error: Rotation is %f but should be 90.0\n", font.Rotation());
}
// TODO // TODO
// - blending mode // - blending mode
@ -762,6 +794,7 @@ TestCase gTestCases[] = {
{ "Test Record And Play Picture", testRecordAndPlayPicture }, { "Test Record And Play Picture", testRecordAndPlayPicture },
{ "Test Record And Play Picture With Offset", testRecordAndPlayPictureWithOffset }, { "Test Record And Play Picture With Offset", testRecordAndPlayPictureWithOffset },
{ "Test AppendToPicture", testAppendToPicture }, { "Test AppendToPicture", testAppendToPicture },
{ "Test Draw Scaled Picture", testDrawScaledPicture },
{ "Test LineArray", testLineArray }, { "Test LineArray", testLineArray },
{ "Test InvertRect", testInvertRect }, { "Test InvertRect", testInvertRect },
{ "Test DrawBitmap", testDrawBitmap }, { "Test DrawBitmap", testDrawBitmap },
@ -790,6 +823,7 @@ TestCase gTestCases[] = {
{ "Test SetFontFamilyAndStyle", testSetFontFamilyAndStyle }, { "Test SetFontFamilyAndStyle", testSetFontFamilyAndStyle },
{ "Test SetDrawingMode", testSetDrawingMode }, { "Test SetDrawingMode", testSetDrawingMode },
{ "Test PushPopState", testPushPopState }, { "Test PushPopState", testPushPopState },
{ "Test FontRotation", testFontRotation },
{ NULL, NULL } { NULL, NULL }
}; };