TurboPower_ipro: Fix line spacings when <br> tag is used.

git-svn-id: trunk@58905 -

components/turbopower_ipro/iphtml.pas

@@ -341,6 +341,7 @@ type
     procedure HideUnmarkedControl; virtual;
     procedure EnumChildren(EnumProc: TIpHtmlNodeEnumProc; UserData: Pointer); virtual;
     procedure AppendSelection(var S : string; var Completed: Boolean); virtual;
+    function GetMargin(AMargin: TIpHtmlElemMargin; ADefault: Integer): Integer; virtual;
   public
     constructor Create(ParentNode : TIpHtmlNode);
     destructor Destroy; override;
@@ -378,6 +379,7 @@ type
     procedure ReportMapRects(M : TRectMethod); override;
     procedure AppendSelection(var S : string; var Completed: Boolean); override;
     procedure EnumChildren(EnumProc: TIpHtmlNodeEnumProc; UserData: Pointer); override;
+    function GetMargin(AMargin: TIpHtmlElemMargin; ADefault: Integer): Integer; override;
   public
     constructor Create(ParentNode : TIpHtmlNode);
     destructor Destroy; override;
@@ -1121,6 +1123,7 @@ type
     FId: string;
   protected
     procedure SetClear(const Value: TIpHtmlBreakClear);
+    function GetMargin(AMargin: TIpHtmlElemMargin; ADefault:Integer): Integer; override;
   public
     constructor Create(ParentNode: TIpHtmlNode);
     procedure Enqueue; override;
@@ -3986,13 +3989,19 @@ begin
     prevelem := PIpHtmlElement(FElementQueue[i-1]);
     case PIpHtmlElement(FElementQueue[i])^.ElementType of
       etSoftLF:
-        if (prevelem.ElementType in [etSoftLF, etHardLF]) then begin
+        if (prevelem.ElementType in [etHardLF, etSoftLF]) then begin
           prevelem.LFHeight := MaxI2(prevelem.LFHeight, elem.LFHeight);
           FElementQueue.Delete(i);
         end;
       etHardLF:
-        if (prevelem.ElementType in [etSoftLF, etHardLF]) then
+        if (prevelem.ElementType = etSoftLF) then begin
           prevelem.LFHeight := MaxI2(prevelem.LFHeight, elem.LFHeight);
+          FElementQueue.Delete(i-1);
+        end else
+        if (prevelem.ElementType = etHardLF) then begin
+          prevelem.LFHeight := prevelem.LFHeight + elem.LFHeight;
+          FElementQueue.Delete(i);
+        end;
     end;
     dec(i);
   end;
@@ -4245,17 +4254,7 @@ begin
 end;
 
 procedure TIpHtmlNode.MakeVisible;
-var
-  elem: PIpHtmlElement;
-  R: TRect;
 begin
-  (*
-  elem := FOwner.FindFirstElementOfNode(self);
-  if elem <> nil then begin
-    R := elem.WordRect2;
-    FOwner.MakeVisible(R{$IFDEF IP_LAZARUS}, true {$ENDIF});
-  end;
-  *)
 end;
 
 procedure TIpHtmlNode.SetProps(const RenderProps: TIpHtmlProps);
@@ -4266,6 +4265,12 @@ procedure TIpHtmlNode.UnmarkControl;
 begin
 end;
 
+function TIpHtmlNode.GetMargin(AMargin: TIpHtmlElemMargin; ADefault: Integer): Integer;
+begin
+  Result := ADefault;
+end;
+
+
 {Attribute support code}
 
 function GetPropertyValue(PI: PPropInfo; const AObject: TObject): string;
@@ -4680,6 +4685,16 @@ begin
   end;
 end;
 
+function TIpHtmlNodeMulti.GetMargin(AMargin: TIpHtmlElemMargin;
+  ADefault: Integer): Integer;
+begin
+  if AMargin.Style = hemsPx then
+    Result := round(AMargin.Size)
+  else
+    Result := ADefault;
+end;
+
+
 { TIpHtmlNodeBODY }
 
 constructor TIpHtmlNodeBODY.Create(ParentNode : TIpHtmlNode);
@@ -9724,14 +9739,6 @@ begin
   inherited SetProps(Props);
 end;
 
-function GetMargin(AMargin: TIpHtmlElemMargin; ADefault: Integer): Integer;
-begin
-  if AMargin.Style = hemsPx then
-    Result := round(AMargin.Size)
-  else
-    Result := ADefault;
-end;
-
 procedure TIpHtmlNodeP.Enqueue;
 var
   elem: PIpHtmlElement;
@@ -10074,19 +10081,45 @@ end;
 { TIpHtmlNodeBR }
 
 procedure TIpHtmlNodeBR.Enqueue;
+var
+  h: Integer;
+  elem: PIpHtmlElement;
 begin
+  if (ParentNode is TIpHtmlNodeP) or
+     (ParentNode is TIpHtmlNodeLI) or
+     (ParentNode is TIpHtmlNodePRE) or
+     (ParentNode is TIpHtmlNodeDIV)
+  then
+    h := 0
+  else
+    h := Props.FontSize;
+
   case Clear of
-  hbcNone :
+    hbcNone :
-    EnqueueElement(Owner.HardLF);
+      begin
-  hbcLeft :
+        elem := Owner.BuildLinefeedEntry(etHardLF, h);
-    EnqueueElement(Owner.HardLFClearLeft);
+        EnqueueElement(elem);
-  hbcRight :
+      end;
-    EnqueueElement(Owner.HardLFClearRight);
+    hbcLeft :
-  hbcAll :
+      EnqueueElement(Owner.HardLFClearLeft);
-    EnqueueElement(Owner.HardLFClearBoth);
+    hbcRight :
+      EnqueueElement(Owner.HardLFClearRight);
+    hbcAll :
+      EnqueueElement(Owner.HardLFClearBoth);
   end;
 end;
 
+function TIpHtmlNodeBR.GetMargin(AMargin: TIpHtmlElemMargin; ADefault: Integer): Integer;
+var
+  default: Integer;
+begin
+  if (ParentNode is TIpHtmlNodeP) then
+    default := 0
+  else
+    default := ADefault;
+  Result := inherited GetMargin(AMargin, default);
+end;
+
 procedure TIpHtmlNodeBR.SetClear(const Value: TIpHtmlBreakClear);
 begin
   FClear := Value;