From 0b72a11c7062496361ed6f994e3ff47c43c5d605 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sun, 11 Aug 2019 20:29:27 -0400 Subject: [PATCH] Fix ProgramBlockView laying out incorrectly --- .../net/shadowfacts/asmr/ui/block/ProgramBlockView.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/net/shadowfacts/asmr/ui/block/ProgramBlockView.kt b/src/main/kotlin/net/shadowfacts/asmr/ui/block/ProgramBlockView.kt index 94311a4..3f8d99b 100644 --- a/src/main/kotlin/net/shadowfacts/asmr/ui/block/ProgramBlockView.kt +++ b/src/main/kotlin/net/shadowfacts/asmr/ui/block/ProgramBlockView.kt @@ -67,7 +67,7 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri if (block is ExecutableBlock) { for (outgoing in block.outgoing) { val hStack = addArrangedSubview(StackView(Axis.HORIZONTAL, Distribution.CENTER)) - val outgoingLabel = hStack.addArrangedSubview(Label(outgoing.translateName(), textAlignment = Label.TextAlignment.RIGHT)) + val outgoingLabel = hStack.addArrangedSubview(Label(outgoing.translateName(), wrappingMode = Label.WrappingMode.NO_WRAP, textAlignment = Label.TextAlignment.RIGHT)) val outgoingView = hStack.addArrangedSubview(ProgramBlockExecutionView(outgoing)) outgoingViews[outgoing] = outgoingView solver.dsl { @@ -85,7 +85,7 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri block.inputs.getOrNull(i)?.let { input -> val inputView = hStack.addArrangedSubview(ProgramBlockParamView(input)) inputViews[input] = inputView - val inputLabel = hStack.addArrangedSubview(Label(input.translateName())) + val inputLabel = hStack.addArrangedSubview(Label(input.translateName(), wrappingMode = Label.WrappingMode.NO_WRAP)) solver.dsl { hStack.heightAnchor equalTo inputLabel.heightAnchor @@ -100,7 +100,7 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri } block.outputs.getOrNull(i)?.let { output -> - val outputLabel = hStack.addArrangedSubview(Label(output.translateName(), textAlignment = Label.TextAlignment.RIGHT)) + val outputLabel = hStack.addArrangedSubview(Label(output.translateName(), wrappingMode = Label.WrappingMode.NO_WRAP, textAlignment = Label.TextAlignment.RIGHT)) val outputView = hStack.addArrangedSubview(ProgramBlockParamView(output)) outputViews[output] = outputView solver.dsl { @@ -132,7 +132,7 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri arrangedSubviews.maxBy { it.bounds.width }?.let { widestSubview -> solver.dsl { - widthAnchor equalTo widestSubview.widthAnchor + widthAnchor equalTo widestSubview.bounds.width } window!!.layout() }