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

TurboPower_ipro: Improved font detection. No hardLF around PRE node.

Browse Source 
git-svn-id: trunk@58911 -
This commit is contained in:
wp 2018-09-08 17:49:38 +00:00
parent 88defc6a48
commit 4572e78d45
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/turbopower_ipro/ipcss.inc
View File

@ -895,7 +895,7 @@ begin
if (Length(Command) > 7) and (Args.Count > 0) then
case Command[7] of
'a': if (Command = 'font-family') then
Font.Name := Args[0];
Font.Name := Args.CommaText; //Args[0];
'i': if (Command = 'font-size') then
Font.Size := Args[0];
't': if (Command = 'font-style') then

23
components/turbopower_ipro/iphtml.pas
View File

@ -2874,10 +2874,11 @@ type
property FactBAParag;
property FlagErrors;
property LinkColor;
property PopupMenu;
property PrintSettings;
property LinksUnderlined;
property MarginHeight;
property MarginWidth;
property PopupMenu;
property PrintSettings;
property ScrollDist;
property ShowHints;
property TabOrder;
@ -11804,10 +11805,24 @@ begin
end;
procedure TIpHtmlNodePRE.Enqueue;
var
h, hf: Integer;
elem: PIpHtmlElement;
begin
if FChildren.Count > 0 then
EnqueueElement(Owner.HardLF);
hf := Props.FontSize;
if FChildren.Count > 0 then begin
h := GetMargin(Props.ElemMarginTop, 0);
elem := Owner.BuildLineFeedEntry(etSoftLF, h);
EnqueueElement(elem);
end;
//EnqueueElement(Owner.HardLF);
inherited Enqueue;
if FChildren.Count > 0 then begin
h := GetMargin(Props.ElemMarginTop, 0);
elem := Owner.BuildLineFeedEntry(etSoftLF, h);
EnqueueElement(elem);
end;
{
if FChildren.Count > 0 then
EnqueueElement(Owner.HardLF);