From 5e489eeac7340d4a8d38260f9d541192140d9bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Tue, 5 Oct 2021 10:12:12 +0200
Subject: [PATCH] Upgrade to new Window API; set minimum window size
---
.../org/briarproject/briar/desktop/BriarService.kt | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
index 292758f814..daa027576b 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
@@ -1,6 +1,5 @@
package org.briarproject.briar.desktop
-import androidx.compose.desktop.Window
import androidx.compose.foundation.background
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
@@ -11,6 +10,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
+import androidx.compose.ui.window.Window
import org.briarproject.bramble.api.account.AccountManager
import org.briarproject.bramble.api.contact.Contact
import org.briarproject.bramble.api.contact.ContactManager
@@ -24,9 +24,11 @@ import org.briarproject.briar.desktop.dialogs.Registration
import org.briarproject.briar.desktop.paul.theme.DarkColorPallet
import org.briarproject.briar.desktop.paul.theme.briarBlack
import org.briarproject.briar.desktop.paul.views.BriarUIStateManager
+import java.awt.Dimension
import javax.annotation.concurrent.Immutable
import javax.inject.Inject
import javax.inject.Singleton
+import kotlin.system.exitProcess
enum class Screen {
REGISTRATION,
@@ -81,7 +83,11 @@ constructor(
}
)
}
- Window(title = title) {
+ Window(
+ title = title,
+ onCloseRequest = { exitProcess(0) },
+ ) {
+ window.minimumSize = Dimension(800, 600)
MaterialTheme(colors = DarkColorPallet) {
when (screenState) {
Screen.REGISTRATION ->
--
GitLab