Skip to content

Commit eadaaf6

Browse files
JasonTheKittenJasonTheKitten
committed
Start flow inline refactor
1 parent 9c74491 commit eadaaf6

18 files changed

+23
-42
lines changed

‎ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/layout/flexbox/FlexInnerDisplayLayout.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.github.webicitybrowser.threadyweb.graphical.directive.layout.flexbox.FlexDirectionDirective.FlexDirection;
1717
import com.github.webicitybrowser.threadyweb.graphical.layout.flexbox.item.FlexItem;
1818
import com.github.webicitybrowser.threadyweb.graphical.layout.flexbox.item.FlexItemSizePreferences;
19-
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.util.BoxOffsetDimensions;
19+
import com.github.webicitybrowser.threadyweb.graphical.layout.util.BoxOffsetDimensions;
2020
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutSizeUtils;
2121
import com.github.webicitybrowser.threadyweb.graphical.lookandfeel.weblaf.stage.render.unit.StyledUnitContext;
2222
import com.github.webicitybrowser.threadyweb.graphical.lookandfeel.weblaf.stage.render.unit.StyledUnitGenerator;

‎ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/layout/flexbox/FlexItemRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.github.webicitybrowser.thready.gui.graphical.lookandfeel.core.stage.render.unit.RenderedUnit;
1010
import com.github.webicitybrowser.threadyweb.graphical.directive.layout.flexbox.FlexDirectionDirective.FlexDirection;
1111
import com.github.webicitybrowser.threadyweb.graphical.layout.flexbox.item.FlexItem;
12-
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.util.BoxOffsetDimensions;
12+
import com.github.webicitybrowser.threadyweb.graphical.layout.util.BoxOffsetDimensions;
1313
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutMarginCalculations;
1414
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutSizeUtils;
1515

‎ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/layout/flexbox/item/FlexItemSizePreferences.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.github.webicitybrowser.threadyweb.graphical.directive.layout.common.size.MinWidthDirective;
1313
import com.github.webicitybrowser.threadyweb.graphical.directive.layout.common.size.WidthDirective;
1414
import com.github.webicitybrowser.threadyweb.graphical.directive.layout.flexbox.FlexDirectionDirective.FlexDirection;
15-
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.util.BoxOffsetDimensions;
15+
import com.github.webicitybrowser.threadyweb.graphical.layout.util.BoxOffsetDimensions;
1616
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutBorderWidthCalculations;
1717
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutMarginCalculations;
1818
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutPaddingCalculations;

‎ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/layout/flow/context/block/FlowBlockBlockRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.github.webicitybrowser.thready.gui.graphical.lookandfeel.core.stage.render.unit.ContextSwitch;
1212
import com.github.webicitybrowser.thready.gui.graphical.lookandfeel.core.stage.render.unit.RenderedUnit;
1313
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.FlowRootContextSwitch;
14-
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.util.BoxOffsetDimensions;
14+
import com.github.webicitybrowser.threadyweb.graphical.layout.util.BoxOffsetDimensions;
1515
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutSizeUtils;
1616
import com.github.webicitybrowser.threadyweb.graphical.lookandfeel.weblaf.stage.render.unit.StyledUnitContext;
1717

‎ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/layout/flow/context/block/FlowBlockUnitRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.github.webicitybrowser.thready.gui.graphical.lookandfeel.core.stage.render.LocalRenderContext;
99
import com.github.webicitybrowser.thready.gui.graphical.lookandfeel.core.stage.render.unit.ContextSwitch;
1010
import com.github.webicitybrowser.thready.gui.graphical.lookandfeel.core.stage.render.unit.RenderedUnit;
11-
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.util.BoxOffsetDimensions;
11+
import com.github.webicitybrowser.threadyweb.graphical.layout.util.BoxOffsetDimensions;
1212
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutSizeUtils;
1313
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutSizeUtils.LayoutSizingContext;
1414
import com.github.webicitybrowser.threadyweb.graphical.value.SizeCalculation.SizeCalculationContext;

‎ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/layout/flow/context/block/FlowBlockUnitRenderingContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.github.webicitybrowser.thready.dimensions.AbsoluteSize;
66
import com.github.webicitybrowser.thready.gui.graphical.lookandfeel.core.stage.box.Box;
77
import com.github.webicitybrowser.thready.gui.graphical.lookandfeel.core.stage.render.LocalRenderContext;
8-
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.util.BoxOffsetDimensions;
8+
import com.github.webicitybrowser.threadyweb.graphical.layout.util.BoxOffsetDimensions;
99

1010
public record FlowBlockUnitRenderingContext(
1111
FlowBlockRenderContext state, Box childBox, BoxOffsetDimensions renderParameters,

‎ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/layout/flow/context/block/floatbox/FlowBlockFloatRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.context.block.FlowBlockUnitRenderer;
1818
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.context.block.FlowBlockUnitRenderingContext;
1919
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.floatbox.FloatTracker;
20-
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.util.BoxOffsetDimensions;
20+
import com.github.webicitybrowser.threadyweb.graphical.layout.util.BoxOffsetDimensions;
2121
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutMarginCalculations;
2222
import com.github.webicitybrowser.threadyweb.graphical.layout.util.LayoutSizeUtils;
2323
import com.github.webicitybrowser.threadyweb.graphical.lookandfeel.weblaf.stage.render.unit.StyledUnitContext;

‎ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/layout/flow/context/inline/FlowInlineLayout.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.FlowConfig;
1515
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.FlowRenderContext;
1616
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.FlowRootContextSwitch;
17-
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.context.inline.contexts.LineContext;
1817
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.context.inline.marker.UnitEnterMarker;
1918
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.context.inline.marker.UnitExitMarker;
2019
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.cursor.LineDimension;
@@ -88,15 +87,15 @@ private static void addInlineBoxToLine(FlowInlineRenderContext state, ChildrenBo
8887
}
8988

9089
private static void pushFormattingInfo(FlowInlineRenderContext state, Box childBox) {
91-
LineContext lineContext = state.lineContext();
90+
LineBoxContainer lineContext = state.lineContext();
9291

9392
UnitEnterMarker unitEnterMarker = new UnitEnterMarker(true, childBox.styleDirectives());
9493
FlowInlineRendererUtil.startNewLineIfNotFits(state, createSizeFromUnitEnterMarker(unitEnterMarker));
9594
lineContext.currentLine().addMarker(unitEnterMarker);
9695
}
9796

9897
private static void popFormattingInfo(FlowInlineRenderContext state, Box childBox) {
99-
LineContext lineContext = state.lineContext();
98+
LineBoxContainer lineContext = state.lineContext();
10099

101100
UnitExitMarker unitExitMarker = new UnitExitMarker(childBox.styleDirectives());
102101
FlowInlineRendererUtil.startNewLineIfNotFits(state, createSizeFromUnitExitMarker(unitExitMarker));

‎ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/layout/flow/context/inline/FlowInlineRenderContext.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@
55
import com.github.webicitybrowser.thready.gui.graphical.lookandfeel.core.stage.render.LocalRenderContext;
66
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.FlowConfig;
77
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.FlowRenderContext;
8-
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.context.inline.contexts.LineContext;
98
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.cursor.LineDimension.LineDirection;
109
import com.github.webicitybrowser.threadyweb.graphical.lookandfeel.weblaf.text.TextConsolidation;
1110

1211
public class FlowInlineRenderContext {
1312

1413
private final FlowConfig flowConfig;
1514
private final FlowRenderContext renderContext;
16-
private final LineContext lineContext;
15+
private final LineBoxContainer lineContext;
1716

1817
private final TextConsolidation textConsolidation = TextConsolidation.create();
1918

2019
public FlowInlineRenderContext(FlowConfig flowConfig, FlowRenderContext renderContext, LineDirection lineDirection) {
2120
this.flowConfig = flowConfig;
2221
this.renderContext = renderContext;
23-
this.lineContext = new LineContext(this, lineDirection);
22+
this.lineContext = new LineBoxContainer(this, lineDirection);
2423
FlowInlineRendererUtil.startNewLine(this);
2524
}
2625

@@ -32,7 +31,7 @@ public FlowRenderContext flowContext() {
3231
return renderContext;
3332
}
3433

35-
public LineContext lineContext() {
34+
public LineBoxContainer lineContext() {
3635
return lineContext;
3736
}
3837

‎ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/layout/flow/context/inline/FlowInlineRendererUtil.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.github.webicitybrowser.thready.dimensions.RelativeDimension;
66
import com.github.webicitybrowser.thready.dimensions.util.AbsoluteDimensionsMath;
77
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.FlowRootContextSwitch;
8-
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.context.inline.contexts.LineContext;
98
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.cursor.LineDimension;
109
import com.github.webicitybrowser.threadyweb.graphical.layout.flow.floatbox.FloatTracker;
1110

@@ -14,15 +13,15 @@ public final class FlowInlineRendererUtil {
1413
private FlowInlineRendererUtil() {}
1514

1615
public static void startNewLineIfNotFits(FlowInlineRenderContext state, AbsoluteSize preferredSize) {
17-
LineContext lineContext = state.lineContext();
16+
LineBoxContainer lineContext = state.lineContext();
1817
LineBox currentLine = lineContext.currentLine();
1918
if (!currentLine.canFit(preferredSize)) {
2019
startNewLine(state);
2120
}
2221
}
2322

2423
public static void startNewLine(FlowInlineRenderContext state) {
25-
LineContext lineContext = state.lineContext();
24+
LineBoxContainer lineContext = state.lineContext();
2625
lineContext.startNewLine(position -> calculateMaxLineSize(state, position));
2726
}
2827

0 commit comments

Comments
 (0)