File tree Expand file tree Collapse file tree 3 files changed +4
-14
lines changed
itext/itext.layout/itext/layout/renderer Expand file tree Collapse file tree 3 files changed +4
-14
lines changed Original file line number Diff line number Diff line change @@ -323,12 +323,6 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
323323 occupiedArea . SetBBox ( Rectangle . GetCommonRectangle ( occupiedArea . GetBBox ( ) , result . GetOccupiedArea ( ) . GetBBox
324324 ( ) ) ) ;
325325 }
326- else {
327- if ( IsAbsolutePosition ( ) && childRenderer . GetOccupiedArea ( ) != null ) {
328- occupiedArea . SetBBox ( Rectangle . GetCommonRectangle ( occupiedArea . GetBBox ( ) , childRenderer . GetOccupiedArea ( ) .
329- GetBBox ( ) ) ) ;
330- }
331- }
332326 }
333327 if ( marginsCollapsingEnabled ) {
334328 marginsCollapseHandler . EndChildMarginsHandling ( layoutBox ) ;
@@ -353,7 +347,7 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
353347 if ( true . Equals ( GetPropertyAsBoolean ( Property . FILL_AVAILABLE_AREA ) ) ) {
354348 occupiedArea . SetBBox ( Rectangle . GetCommonRectangle ( occupiedArea . GetBBox ( ) , layoutBox ) ) ;
355349 }
356- if ( FloatingHelper . IsRendererFloating ( this ) || isCellRenderer ) {
350+ if ( IsAbsolutePosition ( ) || FloatingHelper . IsRendererFloating ( this ) || isCellRenderer ) {
357351 FloatingHelper . IncludeChildFloatsInOccupiedArea ( floatRendererAreas , this ) ;
358352 }
359353 IRenderer overflowRenderer_1 = null ;
Original file line number Diff line number Diff line change @@ -239,14 +239,10 @@ internal static LayoutArea AdjustResultOccupiedAreaForFloatAndClear(IRenderer re
239239
240240 internal static void IncludeChildFloatsInOccupiedArea ( IList < Rectangle > floatRendererAreas , IRenderer renderer
241241 ) {
242- Rectangle bBox = renderer . GetOccupiedArea ( ) . GetBBox ( ) ;
243- float lowestFloatBottom = bBox . GetBottom ( ) ;
244242 foreach ( Rectangle floatBox in floatRendererAreas ) {
245- if ( floatBox . GetBottom ( ) < lowestFloatBottom ) {
246- lowestFloatBottom = floatBox . GetBottom ( ) ;
247- }
243+ renderer . GetOccupiedArea ( ) . SetBBox ( Rectangle . GetCommonRectangle ( renderer . GetOccupiedArea ( ) . GetBBox ( ) , floatBox
244+ ) ) ;
248245 }
249- bBox . SetHeight ( bBox . GetTop ( ) - lowestFloatBottom ) . SetY ( lowestFloatBottom ) ;
250246 }
251247
252248 internal static MinMaxWidth CalculateMinMaxWidthForFloat ( AbstractRenderer renderer , FloatPropertyValue ? floatPropertyVal
Original file line number Diff line number Diff line change 1- b8ddb83622e0aa0735b1a9fd961f0f3b2dbc7550
1+ 0e969bef87f097a1603843bcafa26ab5953f15f0
You can’t perform that action at this time.
0 commit comments