From b8fadb06b56c73f0a50029839b77d9812ea6da56 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 9 May 2021 15:56:15 +0300 Subject: [PATCH] Fix style display --- .../src/main/kotlin/ringui/island/Island.kt | 3 ++ .../ringPropertyEditor.kt | 37 +++++++------------ 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/ui/ring/src/main/kotlin/ringui/island/Island.kt b/ui/ring/src/main/kotlin/ringui/island/Island.kt index 300faefa..03530902 100644 --- a/ui/ring/src/main/kotlin/ringui/island/Island.kt +++ b/ui/ring/src/main/kotlin/ringui/island/Island.kt @@ -28,6 +28,9 @@ public fun RBuilder.ringIsland(handler: RHandler) { public fun RBuilder.ringIsland(header: String, handler: RHandler) { ringIsland { ringIslandHeader { + attrs{ + border = true + } +header } ringIslandContent(handler) diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt index 40101c5e..680bc6bf 100644 --- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt +++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt @@ -20,22 +20,14 @@ public fun RBuilder.ringPropertyEditor( key: Any? = null, ) { - ringIsland { - ringIslandHeader { - attrs { - border = true - } - +"Properties" - } - ringIslandContent { - propertyEditor( - ownProperties = vision.ownProperties, - allProperties = vision.allProperties(), - updateFlow = vision.propertyChanges, - descriptor = descriptor, - key = key - ) - } + ringIsland("Properties") { + propertyEditor( + ownProperties = vision.ownProperties, + allProperties = vision.allProperties(), + updateFlow = vision.propertyChanges, + descriptor = descriptor, + key = key + ) } val styles = if (vision is SolidReference) { (vision.styles + vision.prototype.styles).distinct() @@ -52,13 +44,12 @@ public fun RBuilder.ringPropertyEditor( } ringIslandContent { ringSmartTabs { - - } - styles.forEach { styleName -> - val style = vision.getStyle(styleName) - if (style != null) { - ringTab(styleName) { - metaViewer(style) + styles.forEach { styleName -> + val style = vision.getStyle(styleName) + if (style != null) { + ringTab(styleName) { + metaViewer(style) + } } } }