From 1c1f12ecafd06a493c26e23c438cbaa7a06bd609 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Fri, 7 Jun 2019 16:57:15 +0200 Subject: [PATCH] clean up --- .../controller/{Controller.kt => RootController.kt} | 1 - .../main/kotlin/org/hso/texturesyncclient/model/GUIModel.kt | 6 +++++- .../texturesyncclient/view/mainView/MainViewController.kt | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) rename client/src/main/kotlin/org/hso/texturesyncclient/controller/{Controller.kt => RootController.kt} (99%) diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/controller/Controller.kt b/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt similarity index 99% rename from client/src/main/kotlin/org/hso/texturesyncclient/controller/Controller.kt rename to client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt index c29a3b5..c340e36 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/controller/Controller.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt @@ -27,7 +27,6 @@ import java.util.UUID import java.nio.file.Files import java.io.FileOutputStream - class RootController : Controller() { private val mvc: MainViewController by inject() diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/model/GUIModel.kt b/client/src/main/kotlin/org/hso/texturesyncclient/model/GUIModel.kt index 35b7557..72a540b 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/model/GUIModel.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/model/GUIModel.kt @@ -25,9 +25,13 @@ class GUIModel constructor(var data: Texture, img: Image) : VBox(){ private val gmc = find(GUIModelController::class) init { + //super.setPadding(Insets(10.0, 10.0, 10.0, 10.0)) super.getChildren().addAll(image, label) super.setOnContextMenuRequested { p0 -> contextMenu.show(this@GUIModel, p0.screenX, p0.screenY) } - super.setOnMouseClicked{ gmc.previewSelectedAction(data) } + super.setOnMouseClicked{ + //this.background = Background(BackgroundFill(Paint.valueOf("#42adaf"), CornerRadii.EMPTY, Insets.EMPTY)) + gmc.previewSelectedAction(data) + } label.paddingTop = 5.0 label.prefWidth = 128.0 diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt index 5330fb8..701351c 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt @@ -56,7 +56,6 @@ class MainViewController : Controller() { mv.cvSearch.isDisable = true runAsync { - //previewList = rootc.search(tags) rootc.queryElements(tags) } ui { // when search finished