From ccda7fbf3f2505b6b1c581dd214b4d1392ffc5d7 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Sun, 26 Jan 2025 18:45:28 +0100 Subject: [PATCH] Better Kotlin-Ant compatibility --- .../app/contrib/ui/ContributionManagerKt.java | 0 app/build.gradle.kts | 3 ++ app/build.xml | 1 + app/src/processing/app/ui/ExamplesLibrary.kt | 33 ++++++++++--------- 4 files changed, 22 insertions(+), 15 deletions(-) rename app/{src => ant}/processing/app/contrib/ui/ContributionManagerKt.java (100%) diff --git a/app/src/processing/app/contrib/ui/ContributionManagerKt.java b/app/ant/processing/app/contrib/ui/ContributionManagerKt.java similarity index 100% rename from app/src/processing/app/contrib/ui/ContributionManagerKt.java rename to app/ant/processing/app/contrib/ui/ContributionManagerKt.java diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5942f0238..773ce6514 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -68,7 +68,10 @@ compose.desktop { upgradeUuid = "89d8d7fe-5602-4b12-ba10-0fe78efbd602" } linux { + appCategory = "Programming" + menuGroup = "Processing" iconFile = project.file("../build/linux/processing.png") + // Fix fonts on some Linux distributions jvmArgs("-Dawt.useSystemAAFontSettings=on") } diff --git a/app/build.xml b/app/build.xml index 0b91c0a14..bb5c1984a 100644 --- a/app/build.xml +++ b/app/build.xml @@ -169,6 +169,7 @@ nowarn="true"> + diff --git a/app/src/processing/app/ui/ExamplesLibrary.kt b/app/src/processing/app/ui/ExamplesLibrary.kt index 630150c01..7a7a3fbd5 100644 --- a/app/src/processing/app/ui/ExamplesLibrary.kt +++ b/app/src/processing/app/ui/ExamplesLibrary.kt @@ -5,21 +5,24 @@ import androidx.compose.runtime.remember import androidx.compose.ui.window.Window import androidx.compose.ui.window.application -fun ExamplesLibrary(){ +class ExamplesLibrary{ + companion object{ + @JvmStatic + fun main(args: Array) = application { + val active = remember { mutableStateOf(true) } + if(!active.value){ + Window(onCloseRequest = ::exitApplication) { + + } + return@application + } + Window( + onCloseRequest = { active.value = false }, + ) { + ExamplesLibrary() + } + } + } } -fun main() = application { - val active = remember { mutableStateOf(true) } - if(!active.value){ - Window(onCloseRequest = ::exitApplication) { - - } - return@application - } - Window( - onCloseRequest = { active.value = false }, - ) { - ExamplesLibrary() - } -} \ No newline at end of file