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

fixed cvSearch style not applying

This commit is contained in:
Jannik 2019-06-04 20:49:07 +02:00
parent 857f35e77e
commit c80233155f
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/kotlin/org/hso/texturesyncclient/app/Main.kt
View File

@ -7,7 +7,7 @@ import org.hso.texturesyncclient.view.mainView.MainViewController
import org.hso.texturesyncclient.view.startupView.StartupView
import tornadofx.App
class Main: App(StartupView::class){
class Main: App(MainView::class){
val controller = RootController()

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

@ -85,7 +85,6 @@ class RootController : Controller() {
fun initConnection(name: String) {
try {
con = Connection(InetAddress.getByName(name))
println("ausgabe")
con.ping()
println("Connection successful")

6
client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt
View File

@ -26,9 +26,9 @@ class DetailView: View() {
minWidth = 250.0
background = Background(BackgroundFill(Paint.valueOf("#9f9f9f"), CornerRadii.EMPTY, Insets.EMPTY))
fieldset("DetailView", labelPosition = Orientation.VERTICAL) {
fieldset(labelPosition = Orientation.VERTICAL) {
field("3D Preview") {
field{
vbox(7) {
add(preview)
}
@ -38,7 +38,7 @@ class DetailView: View() {
add(metaLabel)
}
field("Tags") {
field {
add(cvTags)
}

1
client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/FolderView.kt
View File

@ -16,6 +16,7 @@ class FolderView : View("FolderView"){
prefWidth = 732.0
prefHeight = 1000.0
background = Background(BackgroundFill(Paint.valueOf("#cfcfcf"), CornerRadii.EMPTY, Insets.EMPTY))
//background = Background(BackgroundFill(Paint.valueOf("#2b2b2b"), CornerRadii.EMPTY, Insets.EMPTY))
style {

19
client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt
View File

@ -2,10 +2,8 @@ package org.hso.texturesyncclient.view.mainView
import com.jfoenix.controls.JFXChipView
import com.jfoenix.controls.JFXSpinner
import com.jfoenix.controls.JFXTextField
import javafx.collections.ListChangeListener
import javafx.geometry.Insets
import javafx.scene.image.Image
import javafx.scene.layout.Background
import javafx.scene.layout.BackgroundFill
import javafx.scene.layout.CornerRadii
@ -26,7 +24,6 @@ class MainView : View() {
maxWidth = 1000.0
minHeight = 500.0
maxHeight = 500.0
background = Background(BackgroundFill(Paint.valueOf("#2b2b2b"), CornerRadii.EMPTY, Insets.EMPTY))
left = vbox {
prefWidth = 750.0
@ -42,20 +39,16 @@ class MainView : View() {
spinnerSearch.isVisible = false
cvSearch.paddingAll = 7.0
cvSearch.style = "-fx-background-color: #3c3f41; -fx-text-inner-color: #b15b2e;" // TODO fix text color
cvSearch.style {
minHeight = Dimension(74.0, Dimension.LinearUnits.px)
}
cvSearch.minHeight = 70.0
cvSearch.style = "-fx-background-color: #3c3f41; -fx-text-inner-color: #b15b2e;"
}
// actions
cvSearch.chips.addListener { change: ListChangeListener.Change<out String>? ->
mvc.cvSearchAction(cvSearch.chips)
cvSearch.chips.onChange {
mvc.cvSearchAction(cvSearch.chips)
}
detailView.cvTags.chips.addListener { change: ListChangeListener.Change<out String>? ->
detailView.cvTags.chips.onChange {
mvc.updateTags()
}