paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-16 15:29:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ unicode fixes

Browse Source 
git-svn-id: branches/unicodekvm@48626 -
This commit is contained in:
nickysn 2021-02-10 17:51:56 +00:00
parent 8a0a97576a
commit b8baf3bb85
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/fv/src/dialogs.inc
View File

@ -1916,7 +1916,7 @@ END;
PROCEDURE TButton.Draw; PROCEDURE TButton.Draw;
VAR I, J, Pos: Sw_Integer; VAR I, J, Pos: Sw_Integer;
Bc: Word; Db: TDrawBuffer; Bc: Word; Db: TDrawBuffer;
C : char; C : Sw_ExtendedGraphemeCluster;
BEGIN BEGIN
If (State AND sfDisabled <> 0) Then { Button disabled } If (State AND sfDisabled <> 0) Then { Button disabled }
Bc := GetColor($0404) Else Begin { Disabled colour } Bc := GetColor($0404) Else Begin { Disabled colour }
@ -1926,7 +1926,7 @@ BEGIN
Bc := GetColor($0703) Else { Set selected colour } Bc := GetColor($0703) Else { Set selected colour }
If AmDefault Then Bc := GetColor($0602); { Set is default colour } If AmDefault Then Bc := GetColor($0602); { Set is default colour }
End; End;
if title=nil then if title=Sw_PString_Empty then
begin begin
MoveChar(Db[0],' ',GetColor(8),1); MoveChar(Db[0],' ',GetColor(8),1);
{No title, draw an empty button.} {No title, draw an empty button.}
@ -1937,7 +1937,7 @@ BEGIN
{We have a title.} {We have a title.}
begin begin
If (Flags AND bfLeftJust = 0) Then Begin { Not left set title } If (Flags AND bfLeftJust = 0) Then Begin { Not left set title }
I := CTextWidth(Title^); { Fetch title width } I := CTextWidth(Title Sw_PString_DeRef); { Fetch title width }
I := (Size.X - I) DIV 2; { Centre in button } I := (Size.X - I) DIV 2; { Centre in button }
End End
Else Else
@ -1951,8 +1951,8 @@ BEGIN
pos:=0; pos:=0;
For j:=0 to I-1 do For j:=0 to I-1 do
MoveChar(Db[pos+j],' ',Bc,1); MoveChar(Db[pos+j],' ',Bc,1);
MoveCStr(Db[I+pos], Title^, Bc); { Move title to buffer } MoveCStr(Db[I+pos], Title Sw_PString_DeRef, Bc); { Move title to buffer }
For j:=pos+CStrLen(Title^)+I to size.X-2 do For j:=pos+CStrLen(Title Sw_PString_DeRef)+I to size.X-2 do
MoveChar(Db[j],' ',Bc,1); MoveChar(Db[j],' ',Bc,1);
end; end;
If not DownFlag then If not DownFlag then
@ -1963,13 +1963,21 @@ BEGIN
Bc:=GetColor(8); Bc:=GetColor(8);
if not DownFlag then if not DownFlag then
begin begin
{$ifdef FV_UNICODE}
c:=#$2584;
{$else FV_UNICODE}
c:='Ü'; c:='Ü';
{$endif FV_UNICODE}
MoveChar(Db,c,Bc,1); MoveChar(Db,c,Bc,1);
WriteLine(Size.X-1, 0, 1, 1, Db); WriteLine(Size.X-1, 0, 1, 1, Db);
end; end;
MoveChar(Db,' ',Bc,1); MoveChar(Db,' ',Bc,1);
if DownFlag then c:=' ' if DownFlag then c:=' '
{$ifdef FV_UNICODE}
else c:=#$2580;
{$else FV_UNICODE}
else c:='ß'; else c:='ß';
{$endif FV_UNICODE}
MoveChar(Db[1],c,Bc,Size.X-1); MoveChar(Db[1],c,Bc,Size.X-1);
WriteLine(0, 1, Size.X, 1, Db); WriteLine(0, 1, Size.X, 1, Db);
End; End;