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

Fix ExtraCharSpacing (Bug #11824) Extra Space was accumulated across blocks of text.

Browse Source 
git-svn-id: trunk@17254 -
This commit is contained in:
martin 2008-11-06 20:09:24 +00:00
parent e9d128ca48
commit 9e060e48c6
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/synedit/synedit.pp
View File

@ -9795,7 +9795,8 @@ begin
//debugln('TCustomSynEdit.RecalcCharExtent B CharHeight=',dbgs(CharHeight));
fTextHeight := CharHeight + fExtraLineSpacing;
BaseStyle := BoldStyles[UsesFontStyle(fsBold)];
fCharWidth := CharWidth {$IFDEF SYN_LAZARUS}+fExtraCharSpacing{$ENDIF};
{$IFDEF SYN_LAZARUS}CharExtra := fExtraCharSpacing;{$ENDIF}
fCharWidth := CharWidth;
end;
{$IFDEF SYN_LAZARUS}
FUseUTF8:=fTextDrawer.UseUTF8;

16
components/synedit/syntextdrawer.pp
View File

@ -217,7 +217,9 @@ type
protected
procedure ReleaseETODist; virtual;
procedure AfterStyleSet; virtual;
{$IFNDEF SYN_LAZARUS}
procedure DoSetCharExtra(Value: Integer); virtual;
{$ENDIF}
{$IFDEF SYN_LAZARUS}
function GetUseUTF8: boolean;
function GetMonoSpace: boolean;
@ -279,7 +281,9 @@ type
FExtTextOutProc: TheExtTextOutProc;
protected
procedure AfterStyleSet; override;
{$IFNDEF SYN_LAZARUS}
procedure DoSetCharExtra(Value: Integer); override;
{$ENDIF}
procedure TextOutOrExtTextOut(X, Y: Integer; fuOptions: UINT;
const ARect: TRect; Text: PChar; Length: Integer); virtual;
procedure ExtTextOutFixed(X, Y: Integer; fuOptions: UINT;
@ -985,12 +989,12 @@ begin
SelectObject(DC, FCrntFont);
Windows.SetTextColor(DC, ColorToRGB(FColor));
Windows.SetBkColor(DC, ColorToRGB(FBkColor));
DoSetCharExtra(FCharExtra);
{$ELSE}
FSavedFont := SelectObject(DC, FCrntFont);
LCLIntf.SetTextColor(DC, FColor);
LCLIntf.SetBkColor(DC, FBkColor);
{$ENDIF}
DoSetCharExtra(FCharExtra);
end;
Inc(FDrawingCount);
end;
@ -1107,15 +1111,21 @@ begin
if FCharExtra <> Value then
begin
FCharExtra := Value;
{$IFDEF SYN_LAZARUS}
FETOSizeInChar := 0;
{$ELSE}
DoSetCharExtra(FCharExtra);
{$ENDIF}
end;
end;
{$IFNDEF SYN_LAZARUS}
procedure TheTextDrawer.DoSetCharExtra(Value: Integer);
begin
if FDC <> 0 then
SetTextCharacterExtra(FDC, Value);
end;
{$ENDIF}
procedure TheTextDrawer.TextOut(X, Y: Integer; Text: PChar;
Length: Integer);
@ -1160,7 +1170,7 @@ var
DistArray: PInteger;
begin
{$IFDEF SYN_LAZARUS}
NeedDistArray:=not MonoSpace;
NeedDistArray:= (FCharExtra > 0) or not MonoSpace;
//DebugLn(['TheTextDrawer.ExtTextOut NeedDistArray=',NeedDistArray]);
if NeedDistArray then begin
if (FETOSizeInChar < Length) then
@ -1244,6 +1254,7 @@ begin
end;
end;
{$IFNDEF SYN_LAZARUS}
procedure TheTextDrawerEx.DoSetCharExtra(Value: Integer);
begin
if not FontStock.IsDBCSFont then
@ -1254,6 +1265,7 @@ begin
else if FCrntDBDx = DBCHAR_CALCULATION_FALED then
SetTextCharacterExtra(StockDC, Value);
end;
{$ENDIF}
procedure TheTextDrawerEx.ExtTextOut(X, Y: Integer; fuOptions: UINT;
const ARect: TRect; Text: PChar; Length: Integer);