kscience/visionforge
7
1
Fork 1
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Fix style display

Browse Source
This commit is contained in:
Alexander Nozik 2021-05-09 15:56:15 +03:00
parent e615fcc2bc
commit b8fadb06b5
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/ring/src/main/kotlin/ringui/island/Island.kt
View File

@ -28,6 +28,9 @@ public fun RBuilder.ringIsland(handler: RHandler<IslandProps>) {
public fun RBuilder.ringIsland(header: String, handler: RHandler<IslandContentProps>) {
ringIsland {
ringIslandHeader {
attrs{
border = true
}
+header
}
ringIslandContent(handler)

37
ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
View File

@ -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)
}
}
}
}