paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-23 01:39:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: simplify DrawText for empty strings (maybe fixes mantis #0025458)

Browse Source 
git-svn-id: trunk@43648 -
This commit is contained in:
paul 2014-01-05 11:16:30 +00:00
parent 3b8a0d9df1
commit 39872a9b0a
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lcl/include/intfbasewinapi.inc
View File

@ -361,7 +361,6 @@ var
I : Integer;
Lines : TStrings;
TDC : hDC;
pStr : PChar;
tmpString,
AStr : String;
pIndex,
@ -626,7 +625,8 @@ var
OffsetRect(theRect, 0, Rect.Bottom - theRect.Bottom);
end;
end;
var
pStr: PChar;
begin
Result := 0;
Lines := nil;
@ -636,35 +636,40 @@ begin
Count := StrLen(Str);
{Calculate # Lines, etc.}
pStr := StrAlloc(Count + 1);
try
StrLCopy(pStr, Str, Count);
pStr[Count] := #0;
AStr := String(pStr);
tmpString := Copy(AStr, 1, Length(ASTR));
{Get font & string metrics}
GetTextMetrics(DC, TM);
If not NoPrefix then
DeleteAmpersands(tmpString);
If tmpString > '' then begin
AP:=TextExtent(DC, tmpString);
AP.cX := AP.cX div Length(tmpString);
end
else begin
AP.cY := TM.tmHeight;
AP.cX := TM.tmAveCharWidth;
if Count > 0 then
begin
pStr := StrAlloc(Count + 1);
try
StrLCopy(pStr, Str, Count);
pStr[Count] := #0;
AStr := String(pStr);
finally
StrDispose(pStr);
end;
end
else
AStr := '';
{Break string into individual lines}
MaxLength := (Rect.Right - Rect.Left);
Lines := DoBreakString(AStr);
finally
StrDispose(pStr);
tmpString := Copy(AStr, 1, Length(AStr));
{Get font & string metrics}
GetTextMetrics(DC, TM);
If not NoPrefix then
DeleteAmpersands(tmpString);
If tmpString > '' then begin
AP:=TextExtent(DC, tmpString);
AP.cX := AP.cX div Length(tmpString);
end
else begin
AP.cY := TM.tmHeight;
AP.cX := TM.tmAveCharWidth;
end;
{Break string into individual lines}
MaxLength := (Rect.Right - Rect.Left);
Lines := DoBreakString(AStr);
{Error occcured...}
If Lines = nil then
exit;