paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-04 06:07:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved ExtTxtOut: support for char dist array

Browse Source 
git-svn-id: trunk@3688 -
This commit is contained in:
mattias 2002-12-07 08:42:08 +00:00
parent 801656d902
commit 5095706b4c
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/synedit/syntextdrawer.pp
View File

@ -1273,23 +1273,25 @@ begin
// a. the text does not containing any multi-byte characters
// AND
// a-1. current font is TrueType.
// a-2. current font is RasterType and it is not italicic.
// a-2. current font is RasterType and it is not italic.
with ARect do
if Assigned(Text) and (Length > 0) and
(Left = X) and (Top = Y) and
((Bottom - Top) = GetCharHeight) and
(Left + GetCharWidth * (Length + 1) > Right) then
{$IFDEF SYN_LAZARUS}
LCLLinux.TextOut(StockDC, X, Y, Text, Length)
{$ELSE}
Windows.TextOut(StockDC, X, Y, Text, Length)
{$ENDIF}
else
{$IFDEF SYN_LAZARUS}
LCLLinux.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil)
{$ELSE}
Windows.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil)
{$ENDIF}
if Assigned(Text) and (Length > 0)
and (Left = X) and (Top = Y)
and ((Bottom - Top) = GetCharHeight)
and
(Left + GetCharWidth * (Length + 1) > Right)
then
{$IFDEF SYN_LAZARUS}
LCLLinux.TextOut(StockDC, X, Y, Text, Length)
{$ELSE}
Windows.TextOut(StockDC, X, Y, Text, Length)
{$ENDIF}
else
{$IFDEF SYN_LAZARUS}
LCLLinux.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil)
{$ELSE}
Windows.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil)
{$ENDIF}
end;
{$IFNDEF HE_LEADBYTES}

5
lcl/include/font.inc
View File

@ -326,7 +326,7 @@ begin
else if AnsiCompareText(Item,'P')=0 then
Result.lfPitchAndFamily:=VARIABLE_PITCH
else if AnsiCompareText(Item,'C')=0 then
Result.lfPitchAndFamily:=FIXED_PITCH;
Result.lfPitchAndFamily:=VARIABLE_PITCH;
GetNextItem; // read AverageWidth
// ToDo
@ -855,6 +855,9 @@ end;
{ =============================================================================
$Log$
Revision 1.10 2002/12/07 08:42:08 mattias
improved ExtTxtOut: support for char dist array
Revision 1.9 2002/10/01 18:00:04 lazarus
AJ: Initial TUpDown, minor property additions to improve reading Delphi created forms.