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

Merge branch 'dev' into feature/df-new

Browse Source 
# Conflicts:
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisionTreeFragment.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
This commit is contained in:
Alexander Nozik 2021-08-11 18:24:35 +03:00
commit c410baac8c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt
View File

@ -16,7 +16,6 @@ import space.kscience.dataforge.meta.descriptors.validate
import space.kscience.dataforge.misc.Named import space.kscience.dataforge.misc.Named
import space.kscience.dataforge.misc.Type import space.kscience.dataforge.misc.Type
import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.Name
import space.kscience.dataforge.provider.provideByType
import space.kscience.dataforge.values.Null import space.kscience.dataforge.values.Null
import space.kscience.dataforge.values.Value import space.kscience.dataforge.values.Value
import space.kscience.visionforge.widget import space.kscience.visionforge.widget
@ -77,7 +76,7 @@ public interface ValueChooser {
TextValueChooser.name -> TextValueChooser TextValueChooser.name -> TextValueChooser
ColorValueChooser.name -> ColorValueChooser ColorValueChooser.name -> ColorValueChooser
ComboBoxValueChooser.name -> ComboBoxValueChooser ComboBoxValueChooser.name -> ComboBoxValueChooser
else -> context.provideByType(type)//Search for additional factories in the plugin else -> null//context.provideByType(type)//Search for additional factories in the plugin
} }
} }

4
visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisionTreeFragment.kt
View File

@ -48,7 +48,9 @@ public class VisionTreeFragment : Fragment() {
} }
} }
selectionModel.selectionMode = SelectionMode.SINGLE selectionModel.selectionMode = SelectionMode.SINGLE
val selectedValue = selectionModel.selectedItemProperty().objectBinding { it?.value?.second } val selectedValue = selectionModel.selectedItemProperty().objectBinding {
it?.value?.second
}
selectedProperty.bind(selectedValue) selectedProperty.bind(selectedValue)
} }
} }