From f721768098f9deca900aaa5df7e67d2fa6c71cf2 Mon Sep 17 00:00:00 2001 From: Rohan Sircar Date: Sun, 20 Dec 2020 16:27:13 +0530 Subject: [PATCH] Minor improvements --- src/main/scala/nova/monadic_sfx/MainApp.scala | 4 ++-- .../implicits/JavaFxMonixObservables.scala | 2 +- .../monadic_sfx/ui/screens/HomeScreen.scala | 19 +++++++++---------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/scala/nova/monadic_sfx/MainApp.scala b/src/main/scala/nova/monadic_sfx/MainApp.scala index c443e1b..2e9777b 100644 --- a/src/main/scala/nova/monadic_sfx/MainApp.scala +++ b/src/main/scala/nova/monadic_sfx/MainApp.scala @@ -42,7 +42,7 @@ class MainApp( startTime: Long )(implicit logger: Logger[Task]) { - lazy val _scene = new Scene { + private lazy val _scene = new Scene { root = new HBox { padding = Insets(20) } @@ -78,7 +78,7 @@ class MainAppDelegate(schedulers: Schedulers)(implicit logger: Logger[Task]) { | -fx-pref-width: 200; | -fx-text-fill: WHITE; """.stripMargin - def init = + val init = for { router <- Task.pure(new FXRouter[Page]) routerStore <- router.store(Page.Home, logger) diff --git a/src/main/scala/nova/monadic_sfx/implicits/JavaFxMonixObservables.scala b/src/main/scala/nova/monadic_sfx/implicits/JavaFxMonixObservables.scala index 27cccff..74379f7 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/JavaFxMonixObservables.scala +++ b/src/main/scala/nova/monadic_sfx/implicits/JavaFxMonixObservables.scala @@ -135,7 +135,7 @@ object JavaFXMonixObservables { def -->(sub: Observer[A]) = prop.onChange((a, b, c) => if (c != null) sub.onNext(c)) - def -->(op: Property[A, A]) = { + def ==>(op: Property[A, A]) = { prop.onChange((a, b, c) => if (c != null) op() = c) } diff --git a/src/main/scala/nova/monadic_sfx/ui/screens/HomeScreen.scala b/src/main/scala/nova/monadic_sfx/ui/screens/HomeScreen.scala index d19c842..6bca716 100644 --- a/src/main/scala/nova/monadic_sfx/ui/screens/HomeScreen.scala +++ b/src/main/scala/nova/monadic_sfx/ui/screens/HomeScreen.scala @@ -21,16 +21,15 @@ class HomeScreen( val myObs = myButton.observableAction // myObs.foreachL(_ => ()) - private lazy val root = Task.deferAction { implicit s => - Task { - new HBox { - children = List( - new Text { - text = "hello" - }, - myButton - ) - } + private lazy val root = Task { + + new HBox { + children = List( + new Text { + text = "hello" + }, + myButton + ) } }