minecraft
/
ASMR
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix ProgramBlockView laying out incorrectly

This commit is contained in:
Shadowfacts 2019-08-11 20:29:27 -04:00
parent a941679197
commit 0b72a11c70
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/net/shadowfacts/asmr/ui/block/ProgramBlockView.kt
View File

@ -67,7 +67,7 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri
if (block is ExecutableBlock) { if (block is ExecutableBlock) {
for (outgoing in block.outgoing) { for (outgoing in block.outgoing) {
val hStack = addArrangedSubview(StackView(Axis.HORIZONTAL, Distribution.CENTER)) 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)) val outgoingView = hStack.addArrangedSubview(ProgramBlockExecutionView(outgoing))
outgoingViews[outgoing] = outgoingView outgoingViews[outgoing] = outgoingView
solver.dsl { solver.dsl {
@ -85,7 +85,7 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri
block.inputs.getOrNull(i)?.let { input -> block.inputs.getOrNull(i)?.let { input ->
val inputView = hStack.addArrangedSubview(ProgramBlockParamView(input)) val inputView = hStack.addArrangedSubview(ProgramBlockParamView(input))
inputViews[input] = inputView inputViews[input] = inputView
val inputLabel = hStack.addArrangedSubview(Label(input.translateName())) val inputLabel = hStack.addArrangedSubview(Label(input.translateName(), wrappingMode = Label.WrappingMode.NO_WRAP))
solver.dsl { solver.dsl {
hStack.heightAnchor equalTo inputLabel.heightAnchor hStack.heightAnchor equalTo inputLabel.heightAnchor
@ -100,7 +100,7 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri
} }
block.outputs.getOrNull(i)?.let { output -> 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)) val outputView = hStack.addArrangedSubview(ProgramBlockParamView(output))
outputViews[output] = outputView outputViews[output] = outputView
solver.dsl { solver.dsl {
@ -132,7 +132,7 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri
arrangedSubviews.maxBy { it.bounds.width }?.let { widestSubview -> arrangedSubviews.maxBy { it.bounds.width }?.let { widestSubview ->
solver.dsl { solver.dsl {
widthAnchor equalTo widestSubview.widthAnchor widthAnchor equalTo widestSubview.bounds.width
} }
window!!.layout() window!!.layout()
} }