localhorst
/
TextureSync
3
1
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

Revert "fix #46" 

This reverts commit f0fe4bb981.
This commit is contained in:
CodeSteak 2019-06-14 01:12:33 +02:00
parent f0fe4bb981
commit a10e2aceb6
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt
View File

@ -303,7 +303,6 @@ class RootController : Controller() {
fun switchMainToImport() { fun switchMainToImport() {
Platform.runLater { Platform.runLater {
find(MainView::class).replaceWith(ImportView::class, sizeToScene = true, centerOnScreen = true) find(MainView::class).replaceWith(ImportView::class, sizeToScene = true, centerOnScreen = true)
find(ImportView::class).reset()
} }
} }

15
client/src/main/kotlin/org/hso/texturesyncclient/view/importView/ImportView.kt
View File

@ -3,13 +3,13 @@ package org.hso.texturesyncclient.view.importView
import com.jfoenix.controls.JFXButton import com.jfoenix.controls.JFXButton
import com.jfoenix.controls.JFXChipView import com.jfoenix.controls.JFXChipView
import com.jfoenix.controls.JFXTextField import com.jfoenix.controls.JFXTextField
import javafx.geometry.Insets
import javafx.geometry.Pos import javafx.geometry.Pos
import javafx.scene.layout.Background import javafx.scene.layout.Background
import javafx.geometry.Insets
import javafx.scene.layout.BackgroundFill import javafx.scene.layout.BackgroundFill
import javafx.scene.layout.CornerRadii import javafx.scene.layout.CornerRadii
import javafx.scene.layout.Priority
import javafx.scene.paint.Paint import javafx.scene.paint.Paint
import javafx.scene.layout.Priority
import org.hso.texturesyncclient.view.mainView.Preview3D import org.hso.texturesyncclient.view.mainView.Preview3D
import tornadofx.* import tornadofx.*
@ -27,10 +27,6 @@ class ImportView : View("TextureSync") {
private val ivc: ImportViewController by inject() private val ivc: ImportViewController by inject()
init { init {
reset()
}
fun reset() {
btnImport.isVisible = false btnImport.isVisible = false
preview.root.isVisible = false preview.root.isVisible = false
} }
@ -97,12 +93,11 @@ class ImportView : View("TextureSync") {
//TODO change color of Chip´s see: https://github.com/jfoenixadmin/JFoenix/blob/master/jfoenix/src/main/resources/com/jfoenix/assets/css/controls/jfx-chip-view.css#L52 //TODO change color of Chip´s see: https://github.com/jfoenixadmin/JFoenix/blob/master/jfoenix/src/main/resources/com/jfoenix/assets/css/controls/jfx-chip-view.css#L52
btnImport.style = "-fx-button-type: RAISED; -fx-background-color: #b15b2e; -fx-text-fill: #3c3f41;" btnImport.style = "-fx-button-type: RAISED; -fx-background-color: #b15b2e; -fx-text-fill: #3c3f41;"
btnBack.style = btnBack.style = "-fx-button-type: RAISED; -fx-background-color: #3c3f41; -fx-text-fill: #2b7bbb; -fx-padding: 10;"
"-fx-button-type: RAISED; -fx-background-color: #3c3f41; -fx-text-fill: #2b7bbb; -fx-padding: 10;"
} }
tfFilePath.textProperty().addListener { _, _, _ -> ivc.validateImport() } tfFilePath.textProperty().addListener{ _, _, _ -> ivc.validateImport() }
tfName.textProperty().addListener { _, _, _ -> ivc.validateImport() } tfName.textProperty().addListener{ _, _, _ -> ivc.validateImport() }
cvTags.chips.onChange { cvTags.chips.onChange {
ivc.validateImport() ivc.validateImport()