mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-16 04:19:19 +02:00
fixed ExtTextOut getting TextHeight
git-svn-id: trunk@9111 -
This commit is contained in:
parent
c2d94e53a0
commit
770fa8ffb2
@ -392,13 +392,9 @@ begin
|
||||
end;
|
||||
|
||||
procedure TXMLObjectWriter.WriteWideString(const Value: WideString);
|
||||
var
|
||||
s: string;
|
||||
// save widestrings as utf8
|
||||
begin
|
||||
SetLength(s,length(Value)*2);
|
||||
if s<>'' then
|
||||
System.Move(Value[1],s[1],length(s));
|
||||
GetPropertyElement('widestring')['value'] := s;
|
||||
GetPropertyElement('widestring')['value'] := System.UTF8Encode(Value);
|
||||
end;
|
||||
|
||||
|
||||
|
@ -29,6 +29,7 @@ type
|
||||
property MyString: string read FMyString write FMyString;
|
||||
property MyEnum: TMyEnum read FMyEnum write FMyEnum;
|
||||
property MySet: TMySet read FMySet write FMySet;
|
||||
|
||||
end;
|
||||
|
||||
|
||||
|
@ -3844,7 +3844,7 @@ begin
|
||||
if UseFont<>nil then begin
|
||||
LineLen := FindChar(#10,Str,Count);
|
||||
UpdateDCTextMetric(TDeviceContext(DC));
|
||||
LineHeight:=DCTextMetric.TextMetric.tmHeight;
|
||||
LineHeight:=GetTextHeight(DCTextMetric);
|
||||
if Buffered then begin
|
||||
TxtPt.X := 0;
|
||||
TxtPt.Y := LineHeight;
|
||||
|
Loading…
Reference in New Issue
Block a user