From 91c512c4e9d01a61f447c8e0707ffbbcf7b52bb7 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Thu, 27 Jun 2019 18:53:11 -0400
Subject: [PATCH] Improve dropdown window layout code

---
 .../shadowfacts/cacao/view/button/DropdownButton.kt  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/net/shadowfacts/cacao/view/button/DropdownButton.kt b/src/main/kotlin/net/shadowfacts/cacao/view/button/DropdownButton.kt
index d100ccf..6da1a3e 100644
--- a/src/main/kotlin/net/shadowfacts/cacao/view/button/DropdownButton.kt
+++ b/src/main/kotlin/net/shadowfacts/cacao/view/button/DropdownButton.kt
@@ -92,7 +92,7 @@ class DropdownButton<Value, ContentView: View>(
 		val dropdownBackground = dropdownWindow.addView(NinePatchView(NinePatchTexture.BUTTON_BG).apply {
 			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
 		val buttons = mutableListOf<Button>()
 		val last = allValues.count() - 1
@@ -113,7 +113,9 @@ class DropdownButton<Value, ContentView: View>(
 			}
 			buttons.add(button)
 			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 {
@@ -128,12 +130,6 @@ class DropdownButton<Value, ContentView: View>(
 			dropdownBackground.bottomAnchor equalTo stack.bottomAnchor
 		}
 		dropdownWindow.layout()
-		dropdownWindow.solver.dsl {
-			buttons.forEach {
-				it.widthAnchor equalTo stack.frame.width
-			}
-		}
-		dropdownWindow.layout()
 	}
 
 	private fun valueSelected(value: Value) {