|
@@ -306,7 +306,7 @@ begin
|
|
|
ChildEl:=ChildNode.Element;
|
|
|
|
|
|
ChildTop:=FLineBorderBoxTop-BFCNode.MarginTop;
|
|
|
- //writeln('TFLBlockFormattingContext.PlaceLineNodes ',ChildEl.GetPath,' ',BFCNode.Left,' ',ChildTop,' BFCNode.Height=',BFCNode.ContentBoxHeight);
|
|
|
+ //writeln('TFLBlockFormattingContext.PlaceLineNodes ',i,' ',ChildEl.GetPath,' ',BFCNode.Left,' ',ChildTop,' BFCNode.Height=',BFCNode.ContentBoxHeight);
|
|
|
ChildBottom:=FLineBorderBoxTop
|
|
|
+BFCNode.BorderTop+BFCNode.PaddingTop
|
|
|
+BFCNode.ContentBoxHeight
|
|
@@ -420,6 +420,7 @@ begin
|
|
|
ChildBorderBoxHeight:=ChildEl.GetComputedCSSLength(fcaHeight,false,true);
|
|
|
if not IsNan(ChildBorderBoxHeight) then
|
|
|
ChildBorderBoxHeight:=ChildBorderBoxHeight+ChildPadBorderY;
|
|
|
+
|
|
|
ChildPrefBorderBox.X:=-1;
|
|
|
|
|
|
// either ChildLeft or ChildRight must be set
|
|
@@ -472,14 +473,14 @@ begin
|
|
|
ChildEl.CSSComputedAttribute[fcaBottom]:=FloatToCSSStr(ChildBottom);
|
|
|
ChildEl.CSSComputedAttribute[fcaWidth]:=FloatToCSSStr(ChildBorderBoxWidth-ChildPadBorderX);
|
|
|
ChildEl.CSSComputedAttribute[fcaHeight]:=FloatToCSSStr(ChildBorderBoxHeight-ChildPadBorderY);
|
|
|
- FLLog(etDebug,['TFLBlockFormattingContext.PlaceAbsoluteNode ',ChildEl.GetPath,
|
|
|
- ' Left=',ChildEl.CSSComputedAttribute[fcaLeft],
|
|
|
- ' Top=',ChildEl.CSSComputedAttribute[fcaTop],
|
|
|
- ' Right=',ChildEl.CSSComputedAttribute[fcaRight],
|
|
|
- ' Bottom=',ChildEl.CSSComputedAttribute[fcaBottom],
|
|
|
- ' Width=',ChildEl.CSSComputedAttribute[fcaWidth],
|
|
|
- ' Height=',ChildEl.CSSComputedAttribute[fcaHeight],
|
|
|
- '']);
|
|
|
+ //writeln('TFLBlockFormattingContext.PlaceAbsoluteNode ',ChildEl.GetPath,
|
|
|
+ // ' Left=',ChildEl.CSSComputedAttribute[fcaLeft],
|
|
|
+ // ' Top=',ChildEl.CSSComputedAttribute[fcaTop],
|
|
|
+ // ' Right=',ChildEl.CSSComputedAttribute[fcaRight],
|
|
|
+ // ' Bottom=',ChildEl.CSSComputedAttribute[fcaBottom],
|
|
|
+ // ' Width=',ChildEl.CSSComputedAttribute[fcaWidth],
|
|
|
+ // ' Height=',ChildEl.CSSComputedAttribute[fcaHeight],
|
|
|
+ // '');
|
|
|
end;
|
|
|
|
|
|
procedure TFLBlockFormattingContext.ClearLineNodes;
|
|
@@ -1203,11 +1204,13 @@ begin
|
|
|
fcuPercent:
|
|
|
begin
|
|
|
aContainer:=GetBlockContainer(El);
|
|
|
+ //writeln('TViewportLayouter.GetPixPerUnit ',El.GetPath,' ',aContainer<>nil,' ',IsHorizontal);
|
|
|
if aContainer<>nil then
|
|
|
begin
|
|
|
if IsHorizontal then
|
|
|
begin
|
|
|
Result:=aContainer.GetComputedCSSLength(fcaWidth,false);
|
|
|
+ //writeln('TViewportLayouter.GetPixPerUnit ',El.GetPath,' Container=',aContainer.GetPath,' ',IsHorizontal,' Con.Width=',Result);
|
|
|
B:=aContainer.GetComputedCSSLength(fcaPaddingLeft,false);
|
|
|
Result:=Result+B;
|
|
|
B:=aContainer.GetComputedCSSLength(fcaPaddingRight,false);
|
|
@@ -1215,7 +1218,7 @@ begin
|
|
|
end
|
|
|
else begin
|
|
|
Result:=aContainer.GetComputedCSSLength(fcaHeight,false);
|
|
|
- exit(0);
|
|
|
+ //writeln('TViewportLayouter.GetPixPerUnit ',El.GetPath,' Container=',aContainer.GetPath,' ',IsHorizontal,' Con.Height=',Result);
|
|
|
B:=aContainer.GetComputedCSSLength(fcaPaddingTop,false);
|
|
|
Result:=Result+B;
|
|
|
B:=aContainer.GetComputedCSSLength(fcaPaddingBottom,false);
|