From 449a453f7bb66f93a0eb7b4ccb0b2772646b92ac Mon Sep 17 00:00:00 2001 From: Olaf Wintermann Date: Fri, 3 Oct 2025 11:44:15 +0200 Subject: [PATCH] switch from sidebarWindow to splitViewWindow --- .../main/kotlin/de/unixwork/rssreader/MainWindow.kt | 10 ++++++---- .../src/main/java/de/unixwork/ui/ToolbarPosition.java | 7 ++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt index f1008c6..eb607d0 100644 --- a/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt +++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt @@ -13,6 +13,7 @@ import de.unixwork.ui.kotlin.sidebarWindow import de.unixwork.ui.kotlin.dialogWindow import de.unixwork.ui.kotlin.openFileDialog import de.unixwork.ui.kotlin.setDefaultWindowSize +import de.unixwork.ui.kotlin.splitViewWindow import java.time.LocalDate import java.time.ZoneId import java.time.format.DateTimeFormatter @@ -36,7 +37,7 @@ class MainWindow() { init { setDefaultWindowSize(1600, 900) - window = sidebarWindow(title = "RSS Reader") { + window = splitViewWindow(title = "RSS Reader", sidebar = true) { sidebar { vbox(fill = true) { sourcelist( @@ -81,7 +82,7 @@ class MainWindow() { } } - hsplitpane(fill = true, initialPosition = 600, positionProperty = "hsplitpane.pos") { + leftPanel { vbox(fill = true) { val model = TableModel() model.addColumn("Title", ColumnType.STRING, -1) @@ -115,7 +116,7 @@ class MainWindow() { } ret } - ) + ) { elm, col -> var result: String? = null when(col) { @@ -136,7 +137,9 @@ class MainWindow() { result } } + } + rightPanel { tabview(fill = true, varname = "tabview", type = TabViewType.INVISIBLE) { tab { // Completely empty tab, we don't want any visible UI elements @@ -174,7 +177,6 @@ class MainWindow() { } } } - } window.ui.windowData = this diff --git a/ui-java/src/main/java/de/unixwork/ui/ToolbarPosition.java b/ui-java/src/main/java/de/unixwork/ui/ToolbarPosition.java index 069ed6d..cfacb66 100644 --- a/ui-java/src/main/java/de/unixwork/ui/ToolbarPosition.java +++ b/ui-java/src/main/java/de/unixwork/ui/ToolbarPosition.java @@ -3,5 +3,10 @@ package de.unixwork.ui; public enum ToolbarPosition { LEFT, CENTER, - RIGHT + RIGHT, + SIDEBAR_LEFT, + SIDEBAR_RIGHT, + RIGHTPANEL_LEFT, + RIGHTPANEL_CENTER, + RIGHTPANEL_RIGHT } -- 2.47.3