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

Improved the DrawString() method that takes offsets per glyph by making the

Browse Source 
client provide the array size. Added version that doesn't take a string length
for convenience.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35866 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-03-15 15:08:07 +00:00
parent 77e5acc0d9
commit a9daf3d911
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
headers/os/interface/View.h
View File

@ -433,8 +433,12 @@ public:
void DrawString(const char* string, int32 length,
BPoint location,
escapement_delta* delta = 0L);
void DrawString(const char* string,
const BPoint* locations,
int32 locationCount);
void DrawString(const char* string, int32 length,
const BPoint* locations);
const BPoint* locations,
int32 locationCount);
virtual void SetFont(const BFont* font,
uint32 mask = B_FONT_ALL);

20
src/kits/interface/View.cpp
View File

@ -45,7 +45,6 @@
#include <String.h>
#include <Window.h>
#include <utf8_functions.h>
#include <AppMisc.h>
#include <AppServerLink.h>
#include <binary_compatibility/Interface.h>
@ -2571,7 +2570,19 @@ BView::DrawString(const char* string, int32 length, BPoint location,
void
BView::DrawString(const char* string, int32 length, const BPoint* locations)
BView::DrawString(const char* string, const BPoint* locations,
int32 locationCount)
{
if (string == NULL)
return;
DrawString(string, strlen(string), locations, locationCount);
}
void
BView::DrawString(const char* string, int32 length, const BPoint* locations,
int32 locationCount)
{
if (fOwner == NULL || string == NULL || length < 1 || locations == NULL)
return;
@ -2580,11 +2591,10 @@ BView::DrawString(const char* string, int32 length, const BPoint* locations)
fOwner->fLink->StartMessage(AS_DRAW_STRING_WITH_OFFSETS);
int32 glyphCount = UTF8CountChars(string, length);
fOwner->fLink->Attach<int32>(length);
fOwner->fLink->Attach<int32>(glyphCount);
fOwner->fLink->Attach<int32>(locationCount);
fOwner->fLink->Attach(string, length);
fOwner->fLink->Attach(locations, glyphCount * sizeof(BPoint));
fOwner->fLink->Attach(locations, locationCount * sizeof(BPoint));
_FlushIfNotInTransaction();

2
src/tests/servers/app/draw_string_offsets/main.cpp
View File

@ -43,7 +43,7 @@ TestView::Draw(BRect updateRect)
offsets[4].x = 30;
offsets[4].y = 10;
DrawString("Hello", strlen("Hello"), offsets);
DrawString("Hello", offsets, 5);
}