From 8a3be763f11d58acbcbb985a0651207d88380971 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 21 Oct 2019 11:38:01 -0400 Subject: [PATCH] Tweak window setup order so viewsd have access to screen in View.wasAdded --- src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt | 3 +++ src/main/kotlin/net/shadowfacts/cacao/Window.kt | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt b/src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt index 0c5beda..fd33fc4 100644 --- a/src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt @@ -37,8 +37,11 @@ open class CacaoScreen: Screen(LiteralText("CacaoScreen")) { */ fun addWindow(window: T, index: Int = _windows.size): T { _windows.add(index, window) + window.screen = this + window.wasAdded() window.resize(width, height) + return window } diff --git a/src/main/kotlin/net/shadowfacts/cacao/Window.kt b/src/main/kotlin/net/shadowfacts/cacao/Window.kt index c060406..27c8d80 100644 --- a/src/main/kotlin/net/shadowfacts/cacao/Window.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/Window.kt @@ -79,7 +79,9 @@ class Window( init { createInternalConstraints() + } + fun wasAdded() { viewController.window = this viewController.loadView()