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

Revert "Make Client resizeable" 

This reverts commit 36a8bccfe3.
This commit is contained in:
CodeSteak 2019-06-08 22:16:47 +02:00 committed by Seil0
parent 4a213afdf5
commit 6b6ef67122
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
4 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import org.hso.texturesyncclient.view.startupView.StartupView
import org.hso.texturesyncclient.view.startupView.StartupViewController
import tornadofx.App
class Main : App(StartupView::class) {
class Main: App(StartupView::class){
//start first controller
private val svc = StartupViewController()
@ -15,6 +15,7 @@ class Main : App(StartupView::class) {
stage.minWidth = 1000.00
stage.minHeight = 500.00
stage.isResizable = false
stage.icons.add(Image("icons/TextureSync_Icon_256x256.jpeg"))
stage.setOnCloseRequest { System.exit(0) }

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

@ -13,7 +13,7 @@ import javafx.scene.layout.CornerRadii
import javafx.scene.paint.Paint
import tornadofx.*
class DetailView : View() {
class DetailView: View() {
val preview = Preview3D()
val metaLabel = Label("Auflösung: 8MP\nName: Texture.png\nAndere: was anderes\nEinfügedatum: 31.02.2019")
@ -31,7 +31,7 @@ class DetailView : View() {
fieldset(labelPosition = Orientation.VERTICAL) {
field {
field{
vbox(7) {
add(preview)
}
@ -54,6 +54,7 @@ class DetailView : View() {
add(btnImport)
}
}
}
style {

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

@ -5,18 +5,16 @@ import javafx.scene.layout.Background
import javafx.scene.layout.BackgroundFill
import javafx.scene.layout.CornerRadii
import javafx.scene.paint.Paint
import tornadofx.View
import tornadofx.flowpane
import tornadofx.paddingAll
import tornadofx.style
import tornadofx.*
class FolderView : View("FolderView") {
class FolderView : View("FolderView"){
override val root = flowpane {
hgap = 5.0
vgap = 5.0
paddingAll = 10.0
prefWidth = 732.0
prefHeight = 401.0
background = Background(BackgroundFill(Paint.valueOf("#2b2b2b"), CornerRadii.EMPTY, Insets.EMPTY))
style {

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

@ -20,28 +20,32 @@ class MainView : View("TextureSync") {
override val root = borderpane {
background = Background(BackgroundFill(Paint.valueOf("#2b2b2b"), CornerRadii.EMPTY, Insets.EMPTY))
minWidth = 1000.0
maxWidth = 1000.0
minHeight = 500.0
maxHeight = 500.0
right = detailView.root
center = vbox {
add(cvSearch)
add(
left = vbox {
//background = Background(BackgroundFill(Paint.valueOf("#2b2b2b"), CornerRadii.EMPTY, Insets.EMPTY))
anchorpane{
this.fitToParentWidth()
paddingAll = 5.0
add(cvSearch)
}
anchorpane {
scrollpane {
//this.fitToParentSize()
isFitToWidth = true
isFitToHeight = true
this.fitToParentSize()
this.vbarPolicy = ScrollPane.ScrollBarPolicy.ALWAYS
content = folderView.root
add(folderView.root)
style = "-fx-background-color:transparent;"
}
)
}
}
right = detailView.root
style {
cvSearch.promptText = "Suche"
cvSearch.paddingAll = 5.0
@ -68,6 +72,7 @@ class MainView : View("TextureSync") {
detailView.btnImport.setOnAction {
mvc.btnImportAction()
}
}
}