Merge commit '9975364' into resize
This commit is contained in:
		@ -7,10 +7,9 @@ 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 by inject()
 | 
			
		||||
    val svc = StartupViewController()
 | 
			
		||||
 | 
			
		||||
    override fun start(stage: Stage) {
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -32,6 +32,7 @@ import javax.imageio.ImageIO
 | 
			
		||||
class RootController : Controller() {
 | 
			
		||||
 | 
			
		||||
    private val mvc: MainViewController by inject()
 | 
			
		||||
 | 
			
		||||
    private val svc: StartupViewController by inject()
 | 
			
		||||
 | 
			
		||||
    private lateinit var con: Connection
 | 
			
		||||
 | 
			
		||||
@ -22,6 +22,7 @@ class StartupView : View("TextureSync") {
 | 
			
		||||
 | 
			
		||||
    private val svc: StartupViewController by inject()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    override val root = borderpane {
 | 
			
		||||
        minWidth = 1000.0
 | 
			
		||||
        minHeight = 500.0
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user