src/main/kotlin/net/shadowfacts/asmr/TestCacaoScreen.kt

@@ -11,7 +11,9 @@ import net.shadowfacts.cacao.util.Color
 import net.shadowfacts.cacao.util.NinePatchTexture
 import net.shadowfacts.cacao.util.Texture
 import net.shadowfacts.cacao.view.*
-import net.shadowfacts.cacao.view.button.DropdownButton
+import net.shadowfacts.cacao.view.button.Button
+import net.shadowfacts.cacao.view.button.EnumButton
+import net.shadowfacts.cacao.view.button.ToggleButton
 
 /**
  * @author shadowfacts
@@ -34,14 +36,9 @@ class TestCacaoScreen: CacaoScreen() {
 				intrinsicContentSize = Size(50.0, 50.0)
 				backgroundColor = Color(0x0000ff)
 			})
-			val purple = blue.addSubview(DropdownButton(
+			val purple = blue.addSubview(ToggleButton(false).apply {
-					initialValue = RedstoneMode.HIGH,
-					allValues = RedstoneMode.values().asIterable(),
-					createView = { Label(it.name) },
-					updateView = { newValue, label -> label.text = newValue.name }
-			).apply {
 				handler = {
-					println("dropdown value: ${it.value}")
+					println("enum button clicked, new value: ${it.state}")
 				}
 			})
 

src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt

@@ -31,26 +31,13 @@ open class CacaoScreen: Screen(TextComponent("CacaoScreen")) {
 	 *
 	 * @param window The Window to add to this screen.
 	 * @param index The index to insert the window into the window list at.
-	 * @return The window that was added, as a convenience.
 	 */
-	fun <T: Window> addWindow(window: T, index: Int = _windows.size): T {
+	fun addWindow(window: Window, index: Int = _windows.size) {
 		_windows.add(index, window)
-		window.screen = this
-		return window
-	}
-
-	/**
-	 * Removes the given window from this screen's window list.
-	 */
-	fun removeWindow(window: Window) {
-		_windows.remove(window)
 	}
 
 	override fun render(mouseX: Int, mouseY: Int, delta: Float) {
-		if (minecraft != null) {
-			// workaround this.minecraft sometimes being null causing a crash
 		renderBackground()
-		}
 
 		val mouse = Point(mouseX, mouseY)
 		windows.forEach {
@@ -60,17 +47,11 @@ open class CacaoScreen: Screen(TextComponent("CacaoScreen")) {
 
 	override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
 		val window = windows.lastOrNull()
-		val result = window?.mouseClicked(Point(mouseX, mouseY), MouseButton.fromMC(button))
+		if (window?.mouseClicked(Point(mouseX, mouseY), MouseButton.fromMC(button)) == true) {
-		when (result) {
-			true ->
 			RenderHelper.playSound(SoundEvents.UI_BUTTON_CLICK)
-			false ->
-				if (windows.size > 1) {
-					removeWindow(windows.last())
-				}
 		}
 
-		return result == true
+		return false
 	}
 
 }

src/main/kotlin/net/shadowfacts/cacao/Window.kt

@@ -16,12 +16,6 @@ import java.util.*
  */
 class Window {
 
-	/**
-	 * The screen that this window belongs to.
-	 * Not initialized until this window is added to a screen, using it before that point will throw a runtime exception.
-	 */
-	lateinit var screen: CacaoScreen
-
 	var solver = Solver()
 
 	// _views is the internal, mutable object, since we only want it to be mutated by the add/removeView methods
@@ -32,15 +26,6 @@ class Window {
 	 */
 	val views: List<View> = _views
 
-	private var viewsSortedByZIndex: List<View> = listOf()
-
-	/**
-	 * Convenience method that removes this window from its [screen].
-	 */
-	fun removeFromScreen() {
-		screen.removeWindow(this)
-	}
-
 	/**
 	 * Adds the given view as a top-level view in this window.
 	 *
@@ -49,9 +34,6 @@ class Window {
 	 */
 	fun <T: View> addView(view: T): T {
 		_views.add(view)
-		viewsSortedByZIndex = views.sortedBy(View::zIndex)
-
-		view.window = this
 		view.solver = solver
 
 		view.wasAdded()
@@ -59,23 +41,12 @@ class Window {
 		return view
 	}
 
-	/**
-	 * Finds all views in this window at the given point.
-	 *
-	 * @param point The point to find views at, in the coordinate system of the window.
-	 * @return All views that contain the point.
-	 */
-	fun viewsAtPoint(point: Point): List<View> {
-		return views.filter { point in it.frame }
-	}
-
 	/**
 	 * Attempts to find a top level view of this window that contains the given point.
 	 * If there are multiple overlapping views, which one this method returns is undefined.
-	 * [viewsAtPoint] may be used, and the resulting List sorted by [View.zIndex].
 	 *
 	 * @param point The point to find views at, in the coordinate system of the window.
-	 * @return the Veiw, if any, that contain the given point.
+	 * @return The view, if any, that contains the given point.
 	 */
 	fun viewAtPoint(point: Point): View? {
 		return views.firstOrNull { point in it.frame }
@@ -98,7 +69,7 @@ class Window {
 	 * @param delta The time elapsed since the last frame.
 	 */
 	fun draw(mouse: Point, delta: Float) {
-		viewsSortedByZIndex.forEach {
+		views.forEach {
 			val mouseInView = Point(mouse.x - it.frame.left, mouse.y - it.frame.top)
 			it.draw(mouseInView, delta)
 		}
@@ -113,7 +84,7 @@ class Window {
 	 * @return Whether the mouse click was handled by a view.
 	 */
 	fun mouseClicked(point: Point, mouseButton: MouseButton): Boolean {
-		val view = viewsAtPoint(point).maxBy(View::zIndex)
+		val view = viewAtPoint(point)
 		if (view != null) {
 			val pointInView = Point(point.x - view.frame.left, point.y - view.frame.top)
 			return view.mouseClicked(pointInView, mouseButton)

src/main/kotlin/net/shadowfacts/cacao/util/ObservableLateInitProperty.kt

@@ -1,4 +1,4 @@
-package net.shadowfacts.cacao.util.properties
+package net.shadowfacts.cacao.util
 
 import kotlin.reflect.KProperty
 
@@ -9,9 +9,6 @@ class ObservableLateInitProperty<T: Any>(val observer: (T) -> Unit) {
 
 	lateinit var storage: T
 
-	val isInitialized: Boolean
-		get() = this::storage.isInitialized
-
 	operator fun getValue(thisRef: Any, property: KProperty<*>): T {
 		return storage
 	}

src/main/kotlin/net/shadowfacts/cacao/util/RenderHelper.kt

@@ -3,12 +3,9 @@ package net.shadowfacts.cacao.util
 import com.mojang.blaze3d.platform.GlStateManager
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.DrawableHelper
-import net.minecraft.client.render.Tessellator
-import net.minecraft.client.render.VertexFormats
 import net.minecraft.client.sound.PositionedSoundInstance
 import net.minecraft.sound.SoundEvent
 import net.shadowfacts.cacao.geometry.Rect
-import org.lwjgl.opengl.GL11
 
 /**
  * Helper methods for rendering using Minecraft's utilities from Cacao views.
@@ -49,23 +46,7 @@ object RenderHelper {
 	 */
 	fun draw(x: Double, y: Double, u: Int, v: Int, width: Double, height: Double, textureWidth: Int, textureHeight: Int) {
 		if (disabled) return
-		val uStart = u.toDouble() / textureWidth
+		DrawableHelper.blit(x.toInt(), y.toInt(), u.toFloat(), v.toFloat(), width.toInt(), height.toInt(), textureWidth, textureHeight)
-		val uEnd = (u + width) / textureWidth
-		val vStart = v.toDouble() / textureHeight
-		val vEnd = (v + height) / textureHeight
-		innerBlit(x, x + width, y, y + height, 0.0, uStart, uEnd, vStart, vEnd)
-	}
-
-	// Copied from net.minecraft.client.gui.DrawableHelper
-	private fun innerBlit(xStart: Double, xEnd: Double, yStart: Double, yEnd: Double, z: Double, uStart: Double, uEnd: Double, vStart: Double, vEnd: Double) {
-		val tessellator = Tessellator.getInstance()
-		val buffer = tessellator.bufferBuilder
-		buffer.begin(GL11.GL_QUADS, VertexFormats.POSITION_UV)
-		buffer.vertex(xStart, yEnd, z).texture(uStart, vEnd).next()
-		buffer.vertex(xEnd, yEnd, z).texture(uEnd, vEnd).next()
-		buffer.vertex(xEnd, yStart, z).texture(uEnd, vStart).next()
-		buffer.vertex(xStart, yStart, z).texture(uStart, vStart).next()
-		tessellator.draw()
 	}
 
 	/**

src/main/kotlin/net/shadowfacts/cacao/util/properties/ResettableLazyProperty.kt

@@ -1,21 +0,0 @@
-package net.shadowfacts.cacao.util.properties
-
-import kotlin.reflect.KProperty
-
-/**
- * @author shadowfacts
- */
-class ResettableLazyProperty<Value>(val initializer: () -> Value) {
-	var value: Value? = null
-
-	operator fun getValue(thisRef: Any, property: KProperty<*>): Value {
-		if (value == null) {
-			value = initializer()
-		}
-		return value!!
-	}
-
-	fun reset() {
-		value = null
-	}
-}

src/main/kotlin/net/shadowfacts/cacao/view/NinePatchView.kt

@@ -4,76 +4,48 @@ import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.geometry.Rect
 import net.shadowfacts.cacao.util.NinePatchTexture
 import net.shadowfacts.cacao.util.RenderHelper
-import net.shadowfacts.cacao.util.properties.ResettableLazyProperty
 
 /**
  * A helper class for drawing a [NinePatchTexture] in a view.
  * `NinePatchView` will draw the given nine patch texture filling its bounds.
  *
- * This class and the region properties are left open for internal framework use, overriding them is not recommended.
- *
  * @author shadowfacts
  * @param ninePatch The nine patch texture that this view will draw.
  */
-open class NinePatchView(val ninePatch: NinePatchTexture): View() {
+class NinePatchView(val ninePatch: NinePatchTexture): View() {
 
 	// Corners
-	private val topLeftDelegate = ResettableLazyProperty {
+	private val topLeft: Rect by lazy {
 		Rect(0.0, 0.0, ninePatch.cornerWidth.toDouble(), ninePatch.cornerHeight.toDouble())
 	}
-	protected open val topLeft by topLeftDelegate
+	private val topRight by lazy {
-
-	private val topRightDelegate = ResettableLazyProperty {
 		Rect(bounds.width - ninePatch.cornerWidth, 0.0, ninePatch.cornerWidth.toDouble(), ninePatch.cornerHeight.toDouble())
 	}
-	protected open val topRight by topRightDelegate
+	private val bottomLeft by lazy {
-
-	private val bottomLeftDelegate = ResettableLazyProperty {
 		Rect(0.0, bounds.height - ninePatch.cornerHeight, ninePatch.cornerWidth.toDouble(), ninePatch.cornerHeight.toDouble())
 	}
-	protected open val bottomLeft by bottomLeftDelegate
+	private val bottomRight by lazy {
-
-	private val bottomRightDelegate = ResettableLazyProperty {
 		Rect(bounds.width - ninePatch.cornerWidth, bounds.height - ninePatch.cornerHeight, ninePatch.cornerWidth.toDouble(), ninePatch.cornerHeight.toDouble())
 	}
-	protected open val bottomRight by bottomRightDelegate
-
 
 	// Edges
-	private val topMiddleDelegate = ResettableLazyProperty {
+	private val topMiddle by lazy {
 		Rect(ninePatch.cornerWidth.toDouble(), topLeft.top, bounds.width - 2 * ninePatch.cornerWidth, ninePatch.cornerHeight.toDouble())
 	}
-	protected open val topMiddle by topMiddleDelegate
+	private val bottomMiddle by lazy {
-
-	private val bottomMiddleDelegate = ResettableLazyProperty {
 		Rect(topMiddle.left, bottomLeft.top, topMiddle.width, topMiddle.height)
 	}
-	protected open val bottomMiddle by bottomMiddleDelegate
+	private val leftMiddle by lazy {
-
-	private val leftMiddleDelegate = ResettableLazyProperty {
 		Rect(topLeft.left, ninePatch.cornerHeight.toDouble(), ninePatch.cornerWidth.toDouble(), bounds.height - 2 * ninePatch.cornerHeight)
 	}
-	protected open val leftMiddle by leftMiddleDelegate
+	private val rightMiddle by lazy {
-
-	private val rightMiddleDelegate = ResettableLazyProperty {
 		Rect(topRight.left, leftMiddle.top, leftMiddle.width, leftMiddle.height)
 	}
-	protected open val rightMiddle by rightMiddleDelegate
-
 
 	// Center
-	private val centerDelegate = ResettableLazyProperty {
+	private val center by lazy {
 		Rect(topLeft.right, topLeft.bottom, topMiddle.width, leftMiddle.height)
 	}
-	protected open val center by centerDelegate
-
-	private val delegates = listOf(topLeftDelegate, topRightDelegate, bottomLeftDelegate, bottomRightDelegate, topMiddleDelegate, bottomMiddleDelegate, leftMiddleDelegate, rightMiddleDelegate, centerDelegate)
-
-	override fun didLayout() {
-		super.didLayout()
-
-		delegates.forEach(ResettableLazyProperty<Rect>::reset)
-	}
 
 	override fun drawContent(mouse: Point, delta: Float) {
 		drawCorners()
@@ -91,8 +63,8 @@ open class NinePatchView(val ninePatch: NinePatchTexture): View() {
 	private fun drawEdges() {
 		// Horizontal
 		for (i in 0 until (topMiddle.width.toInt() / ninePatch.centerWidth)) {
-			RenderHelper.draw(topMiddle.left + i * ninePatch.centerWidth, topMiddle.top, ninePatch.topMiddle.u, ninePatch.topMiddle.v, ninePatch.centerWidth.toDouble(), topMiddle.height, ninePatch.texture.width, ninePatch.texture.height)
+			RenderHelper.draw(topMiddle.left + i * ninePatch.centerWidth, topMiddle.top, ninePatch.topMiddle.u, ninePatch.topMiddle.v, ninePatch.centerWidth.toDouble(), ninePatch.cornerHeight.toDouble(), ninePatch.texture.width, ninePatch.texture.height)
-			RenderHelper.draw(bottomMiddle.left + i * ninePatch.centerWidth, bottomMiddle.top, ninePatch.bottomMiddle.u, ninePatch.bottomMiddle.v, ninePatch.centerWidth.toDouble(), bottomMiddle.height, ninePatch.texture.width, ninePatch.texture.height)
+			RenderHelper.draw(bottomMiddle.left + i * ninePatch.centerWidth, bottomMiddle.top, ninePatch.bottomMiddle.u, ninePatch.bottomMiddle.v, ninePatch.centerWidth.toDouble(), ninePatch.cornerHeight.toDouble(), ninePatch.texture.width, ninePatch.texture.height)
 		}
 		val remWidth = topMiddle.width.toInt() % ninePatch.centerWidth
 		if (remWidth > 0) {

src/main/kotlin/net/shadowfacts/cacao/view/View.kt

@@ -2,10 +2,8 @@ package net.shadowfacts.cacao.view
 
 import net.shadowfacts.kiwidsl.dsl
 import net.shadowfacts.cacao.LayoutVariable
-import net.shadowfacts.cacao.Window
 import net.shadowfacts.cacao.geometry.*
 import net.shadowfacts.cacao.util.*
-import net.shadowfacts.cacao.util.properties.ObservableLateInitProperty
 import no.birkett.kiwi.Constraint
 import no.birkett.kiwi.Solver
 import java.util.*
@@ -18,13 +16,6 @@ import java.util.*
  */
 open class View() {
 
-	/**
-	* The window whose view hierarchy this view belongs to.
-	* Not initialized until the root view in this hierarchy has been added to a hierarchy,
-	* using it before that will throw a runtime exception.
-	*/
-	lateinit var window: Window
-
 	/**
 	 * The constraint solver used by the [net.shadowfacts.cacao.Window] this view belongs to.
 	 * Not initialized until [wasAdded] called, using it before that will throw a runtime exception.
@@ -87,12 +78,6 @@ open class View() {
 	 */
 	lateinit var bounds: Rect
 
-	/**
-	 * The position on the Z-axis of this view.
-	 * Views are rendered from lowest Z index to highest. Clicks are handled from highest to lowest.
-	 */
-	var zIndex: Double = 0.0
-
 	/**
 	 * The intrinsic size of this view's content. May be null if the view doesn't have any content or there is no
 	 * intrinsic size.
@@ -119,9 +104,6 @@ open class View() {
 	var superview: View? = null
 	// _subviews is the internal, mutable object since we only want it to by mutated by the add/removeSubview methods
 	private val _subviews = LinkedList<View>()
-
-	private var subviewsSortedByZIndex: List<View> = listOf()
-
 	/**
 	 * The list of all the subviews of this view.
 	 * This list should never by mutated directly, only by the [addSubview]/[removeSubview] methods.
@@ -161,31 +143,17 @@ open class View() {
 	 */
 	fun <T: View> addSubview(view: T): T {
 		_subviews.add(view)
-		subviewsSortedByZIndex = subviews.sortedBy(View::zIndex)
-
 		view.superview = this
 		view.solver = solver
-		view.window = window
 
 		view.wasAdded()
 
 		return view
 	}
 
-	/**
-	 * Finds all subviews that contain the given point.
-	 *
-	 * @param point The point to find subviews for, in the coordinate system of this view.
-	 * @return All views that contain the given point.
-	 */
-	fun subviewsAtPoint(point: Point): List<View> {
-		return subviews.filter { point in it.frame }
-	}
-
 	/**
 	 * Attempts to find a subview which contains the given point.
 	 * If multiple subviews contain the given point, which one this method returns is undefined.
-	 * [subviewsAtPoint] may be used, and the resulting List sorted by [View.zIndex].
 	 *
 	 * @param point The point to find a subview for, in the coordinate system of this view.
 	 * @return The view, if any, that contains the given point.
@@ -265,7 +233,7 @@ open class View() {
 
 		drawContent(mouse, delta)
 
-		subviewsSortedByZIndex.forEach {
+		subviews.forEach {
 			val mouseInView = convert(mouse, to = it)
 			it.draw(mouseInView, delta)
 		}
@@ -293,7 +261,7 @@ open class View() {
 	 * @return Whether the mouse click was handled by this view or any subviews.
 	 */
 	open fun mouseClicked(point: Point, mouseButton: MouseButton): Boolean {
-		val view = subviewsAtPoint(point).maxBy(View::zIndex)
+		val view = subviewAtPoint(point)
 		if (view != null) {
 			val pointInView = convert(point, to = view)
 			return view.mouseClicked(pointInView, mouseButton)

src/main/kotlin/net/shadowfacts/cacao/view/button/AbstractButton.kt

@@ -1,5 +1,6 @@
 package net.shadowfacts.cacao.view.button
 
+import net.minecraft.sound.SoundEvents
 import net.minecraft.util.Identifier
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.util.MouseButton
@@ -112,11 +113,14 @@ abstract class AbstractButton<Impl: AbstractButton<Impl>>(val content: View, val
 	override fun mouseClicked(point: Point, mouseButton: MouseButton): Boolean {
 		if (disabled) return false
 
+		val handler = handler
+		if (handler != null) {
 			// We can perform an unchecked cast here because we are certain that Impl will be the concrete implementation
 			// of AbstractButton.
 			// For example, an implementing class may be defined as such: `class Button: AbstractButton<Button>`
 			@Suppress("UNCHECKED_CAST")
-		handler?.invoke(this as Impl)
+			handler(this as Impl)
+		}
 
 		return true
 	}

src/main/kotlin/net/shadowfacts/cacao/view/button/DropdownButton.kt

@@ -1,209 +0,0 @@
-package net.shadowfacts.cacao.view.button
-
-import net.minecraft.util.Identifier
-import net.shadowfacts.cacao.Window
-import net.shadowfacts.cacao.geometry.Axis
-import net.shadowfacts.cacao.geometry.Point
-import net.shadowfacts.cacao.geometry.Rect
-import net.shadowfacts.cacao.util.MouseButton
-import net.shadowfacts.cacao.util.NinePatchTexture
-import net.shadowfacts.cacao.util.Texture
-import net.shadowfacts.cacao.util.properties.ResettableLazyProperty
-import net.shadowfacts.cacao.view.NinePatchView
-import net.shadowfacts.cacao.view.StackView
-import net.shadowfacts.cacao.view.TextureView
-import net.shadowfacts.cacao.view.View
-import net.shadowfacts.kiwidsl.dsl
-
-/**
- * A button that provides a dropdown for the user to select from a list of values.
- * The button itself shows a [ContentView] representing the currently selected [Value] and an image indicator that serves
- * as a hint for the ability to click the button and display the dropdown.
- *
- * The dropdown list itself is displayed by presenting a new [Window] at the front of the window stack.
- * Each possible value is represented in the list by a button containing a [ContentView] for that value, with the button
- * for the current value being disabled.
- *
- * @author shadowfacts
- * @param Value The type of value that the dropdown selects.
- * @param ContentView The specific type of the [View] that represents selected item in the button and each item in the dropdown list.
- * @param initialValue The initial value of the dropdown button.
- * @param allValues List of all allowed values for the dropdown.
- * @param createView A function that creates a [ContentView] representing the given [Value].
- * 						Positioning of content views is handled by the dropdown.
- * @param updateView A function for updating the view used as the button's 'label' that's visible even when the dropdown isn't.
- */
-class DropdownButton<Value, ContentView: View>(
-		val initialValue: Value,
-		val allValues: Iterable<Value>,
-		val createView: (Value) -> ContentView,
-		val updateView: (newValue: Value, view: ContentView) -> Unit,
-		padding: Double = 4.0
-): AbstractButton<DropdownButton<Value, ContentView>>(
-		StackView(Axis.HORIZONTAL),
-		padding
-) {
-
-	companion object {
-		val DROPDOWN_INDICATOR = Texture(Identifier("asmr", "textures/gui/dropdown.png"), 0, 0)
-	}
-
-	private val stackView: StackView
-		get() = content as StackView
-
-	private val contentView: ContentView
-		get() = stackView.arrangedSubviews.first() as ContentView
-
-	private lateinit var dropdownIndicator: TextureView
-
-	/**
-	 * The currently selected [Value] of the dropdown.
-	 */
-	var value: Value = initialValue
-		set(value) {
-			field = value
-			updateView(value, contentView)
-			window.layout()
-		}
-
-	override fun wasAdded() {
-		super.wasAdded()
-
-		stackView.addArrangedSubview(createView(initialValue))
-		dropdownIndicator = stackView.addArrangedSubview(TextureView(DROPDOWN_INDICATOR))
-
-		solver.dsl {
-			dropdownIndicator.widthAnchor equalTo 9
-			dropdownIndicator.heightAnchor equalTo 9
-		}
-	}
-
-	override fun mouseClicked(point: Point, mouseButton: MouseButton): Boolean {
-		return if (mouseButton == MouseButton.LEFT || mouseButton == MouseButton.RIGHT) {
-			showDropdown()
-			true
-		} else {
-			super.mouseClicked(point, mouseButton)
-		}
-	}
-
-	private fun showDropdown() {
-		val dropdownWindow = window.screen.addWindow(Window())
-		val dropdownBackground = dropdownWindow.addView(NinePatchView(DEFAULT_BG).apply {
-			zIndex = -1.0
-		})
-		val stack = dropdownWindow.addView(StackView(Axis.VERTICAL, StackView.Distribution.LEADING))
-		lateinit var selectedButton: View
-		val buttons = mutableListOf<Button>()
-		val last = allValues.count() - 1
-		for ((index, value) in allValues.withIndex()) {
-			val contentView = createView(value)
-			val button = stack.addArrangedSubview(Button(contentView, padding).apply {
-				background = null
-				hoveredBackground = DropdownItemBackgroundView(index == 0, index == last, HOVERED_BG)
-				disabledBackground = DropdownItemBackgroundView(index == 0, index == last, DISABLED_BG)
-				disabled = value == this@DropdownButton.value
-				handler = {
-					dropdownWindow.removeFromScreen()
-					valueSelected(value)
-				}
-			})
-			if (value == this@DropdownButton.value) {
-				selectedButton = button
-			}
-			buttons.add(button)
-			dropdownWindow.solver.dsl {
-				stack.widthAnchor greaterThanOrEqualTo button.widthAnchor
-			}
-		}
-		dropdownWindow.solver.dsl {
-			// constrain to the DropdownButton anchor's value constant, because we're crossing windows and
-			// therefore solvers, which isn't allowed
-			stack.leftAnchor equalTo this@DropdownButton.rightAnchor.value
-			selectedButton.centerYAnchor equalTo this@DropdownButton.centerYAnchor.value
-
-			dropdownBackground.leftAnchor equalTo stack.leftAnchor
-			dropdownBackground.rightAnchor equalTo stack.rightAnchor
-			dropdownBackground.topAnchor equalTo stack.topAnchor
-			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) {
-		this.value = value
-		handler?.invoke(this)
-	}
-
-}
-
-private class DropdownItemBackgroundView(
-		private val first: Boolean,
-		private val last: Boolean,
-		ninePatch: NinePatchTexture
-): NinePatchView(ninePatch) {
-
-	// Corners
-	private val topLeftDelegate = ResettableLazyProperty {
-		super.topLeft
-		Rect(0.0, 0.0, ninePatch.cornerWidth.toDouble(), if (first) ninePatch.cornerHeight.toDouble() else 0.0)
-	}
-	override val topLeft by topLeftDelegate
-
-	private val topRightDelegate = ResettableLazyProperty {
-		Rect(bounds.width - ninePatch.cornerWidth, 0.0, topLeft.width, topLeft.height)
-	}
-	override val topRight by topRightDelegate
-
-	private val bottomLeftDelegate = ResettableLazyProperty {
-		Rect(topLeft.left, bounds.height - ninePatch.cornerHeight, topLeft.width, if (last) ninePatch.cornerHeight.toDouble() else 0.0)
-	}
-	override val bottomLeft by bottomLeftDelegate
-
-	private val bottomRightDelegate = ResettableLazyProperty {
-		Rect(topRight.left, bottomLeft.top, topLeft.width, bottomLeft.height)
-	}
-	override val bottomRight by bottomRightDelegate
-
-	// Edges
-	private val topMiddleDelegate = ResettableLazyProperty {
-		Rect(ninePatch.cornerWidth.toDouble(), topLeft.top, bounds.width - 2 * ninePatch.cornerWidth, topLeft.height)
-	}
-	override val topMiddle by topMiddleDelegate
-
-	private val bottomMiddleDelegate = ResettableLazyProperty {
-		Rect(topMiddle.left, bottomLeft.top, topMiddle.width, bottomLeft.height)
-	}
-	override val bottomMiddle by bottomMiddleDelegate
-
-	private val leftMiddleDelegate = ResettableLazyProperty {
-		Rect(topLeft.left, topLeft.bottom, topLeft.width, bounds.height - (if (first && last) 2 else if (first || last) 1 else 0) * ninePatch.cornerHeight)
-	}
-	override val leftMiddle by leftMiddleDelegate
-
-	private val rightMiddleDelegate = ResettableLazyProperty {
-		Rect(topRight.left, topRight.bottom, topRight.width, leftMiddle.height)
-	}
-	override val rightMiddle by rightMiddleDelegate
-
-	// Center
-	private val centerDelegate = ResettableLazyProperty {
-		Rect(topLeft.right, topMiddle.bottom, topMiddle.width, leftMiddle.height)
-	}
-	override val center by centerDelegate
-
-	private val delegates = listOf(topLeftDelegate, topRightDelegate, bottomLeftDelegate, bottomRightDelegate, topMiddleDelegate, bottomMiddleDelegate, leftMiddleDelegate, rightMiddleDelegate, centerDelegate)
-
-	override fun didLayout() {
-		super.didLayout()
-
-		delegates.forEach(ResettableLazyProperty<Rect>::reset)
-	}
-
-}