From c0438a6e34ed109a7d5de070c8e5139d5684edce Mon Sep 17 00:00:00 2001 From: Seil0 Date: Thu, 9 May 2019 13:55:22 +0200 Subject: [PATCH] add ChipView and meta Label to DetailView --- .../kotlin/org/hso/texturesyncclient/app/Main.kt | 2 +- .../view/mainView/DetailView.kt | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/app/Main.kt b/client/src/main/kotlin/org/hso/texturesyncclient/app/Main.kt index b178587..65b27a8 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/app/Main.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/app/Main.kt @@ -5,6 +5,6 @@ import org.hso.texturesyncclient.view.mainView.MainView import org.hso.texturesyncclient.view.startupView.StartupView import tornadofx.App -class Main: App(ImportView::class){ +class Main: App(MainView::class){ } \ No newline at end of file diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt index 730a35f..fb41d84 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt @@ -1,7 +1,9 @@ package org.hso.texturesyncclient.view.mainView +import com.jfoenix.controls.JFXChipView import javafx.geometry.Insets import javafx.geometry.Orientation +import javafx.scene.control.Label import javafx.scene.image.Image import javafx.scene.layout.Background import javafx.scene.layout.BackgroundFill @@ -12,6 +14,8 @@ import tornadofx.* class DetailView: View() { val preview = Preview3D() + val metaLabel = Label("Auflösung: 8MP\n Name: Texture.png\n Andere: was anderes") + val cvTags = JFXChipView() init { // set a default texture @@ -30,13 +34,19 @@ class DetailView: View() { } } - field("Text input") { - + field("Meta") { + add(metaLabel) } field("Tags") { - + add(cvTags) } + + // TODO add "Import" Btn + } + + style { + cvTags.style = "-fx-background-color: #3c3f41; -fx-text-inner-color: #b15b2e;" } }