Skip to content

Commit 1996179

Browse files
committed
Clean up sizing policy.
1 parent a2e676f commit 1996179

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

lets-plot-swing-skia/src/main/kotlin/org/jetbrains/letsPlot/skia/swing/PlotComponentProviderSkiaSwing.kt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,14 @@ import javax.swing.JComponent
1616

1717
internal class PlotComponentProviderSkiaSwing(
1818
private val processedSpec: MutableMap<String, Any>,
19-
private val preserveAspectRatio: Boolean,
2019
private val computationMessagesHandler: (List<String>) -> Unit
2120
) : PlotComponentProvider {
2221

23-
override fun createComponent(containerSize: Dimension?, sizingPolicy: SizingPolicy, specOverrideList: List<Map<String, Any>>): JComponent {
24-
val plotSize = containerSize?.let {
25-
SizingPolicy.fitContainerSize(preserveAspectRatio)
26-
val preferredSize = containerSize
27-
DoubleVector(preferredSize.width.toDouble(), preferredSize.height.toDouble())
28-
}
29-
22+
override fun createComponent(
23+
containerSize: Dimension?,
24+
sizingPolicy: SizingPolicy,
25+
specOverrideList: List<Map<String, Any>>
26+
): JComponent {
3027
return MonolithicSkiaAwt.buildPlotFromProcessedSpecs(
3128
plotSpec = processedSpec,
3229
containerSize = containerSize?.let { DoubleVector(it.width.toDouble(), it.height.toDouble()) },

lets-plot-swing-skia/src/main/kotlin/org/jetbrains/letsPlot/skia/swing/PlotPanelSkiaSwing.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ open class PlotPanelSkiaSwing(
1818
) : PlotPanel(
1919
plotComponentProvider = PlotComponentProviderSkiaSwing(
2020
processedSpec = processedSpec,
21-
preserveAspectRatio = preserveAspectRatio,
2221
computationMessagesHandler = computationMessagesHandler
2322
),
2423
preferredSizeFromPlot = preferredSizeFromPlot,
24+
sizingPolicy = SizingPolicy.fitContainerSize(preserveAspectRatio),
2525
repaintDelay = repaintDelay,
2626
applicationContext = AWT_APP_CONTEXT,
27-
sizingPolicy = SizingPolicy.fitContainerSize(preserveAspectRatio)
2827
)

0 commit comments

Comments
 (0)