Improve dropdown window layout code

This commit is contained in:
Shadowfacts 2019-06-27 18:53:11 -04:00
parent f29e690208
commit 91c512c4e9
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
1 changed files with 4 additions and 8 deletions

View File

@ -92,7 +92,7 @@ class DropdownButton<Value, ContentView: View>(
val dropdownBackground = dropdownWindow.addView(NinePatchView(NinePatchTexture.BUTTON_BG).apply { val dropdownBackground = dropdownWindow.addView(NinePatchView(NinePatchTexture.BUTTON_BG).apply {
zIndex = -1.0 zIndex = -1.0
}) })
val stack = dropdownWindow.addView(StackView(Axis.VERTICAL, StackView.Distribution.LEADING)) val stack = dropdownWindow.addView(StackView(Axis.VERTICAL, StackView.Distribution.FILL))
lateinit var selectedButton: View lateinit var selectedButton: View
val buttons = mutableListOf<Button>() val buttons = mutableListOf<Button>()
val last = allValues.count() - 1 val last = allValues.count() - 1
@ -113,7 +113,9 @@ class DropdownButton<Value, ContentView: View>(
} }
buttons.add(button) buttons.add(button)
dropdownWindow.solver.dsl { dropdownWindow.solver.dsl {
stack.widthAnchor greaterThanOrEqualTo button.widthAnchor if (button.content.intrinsicContentSize != null) {
button.widthAnchor greaterThanOrEqualTo button.content.intrinsicContentSize!!.width + 2 * button.padding
}
} }
} }
dropdownWindow.solver.dsl { dropdownWindow.solver.dsl {
@ -128,12 +130,6 @@ class DropdownButton<Value, ContentView: View>(
dropdownBackground.bottomAnchor equalTo stack.bottomAnchor dropdownBackground.bottomAnchor equalTo stack.bottomAnchor
} }
dropdownWindow.layout() dropdownWindow.layout()
dropdownWindow.solver.dsl {
buttons.forEach {
it.widthAnchor equalTo stack.frame.width
}
}
dropdownWindow.layout()
} }
private fun valueSelected(value: Value) { private fun valueSelected(value: Value) {