fix: preferred sizes and demo image

xemantic · Aug 15, 2024 · fc8134e · fc8134e
1 parent ed921ee
commit fc8134e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/demo/mvp-implementation/src/main/kotlin/MvpBrowserApp.kt b/demo/mvp-implementation/src/main/kotlin/MvpBrowserApp.kt
@@ -21,8 +21,10 @@ package com.xemantic.kotlin.swing.demo.mvp
 
 import com.xemantic.kotlin.swing.*
 import kotlinx.coroutines.launch
+import java.awt.Dimension
 
-fun main(vararg args: String) = MainWindow("My Browser") {
+fun main(vararg args: String) = MainWindow("My Browser") { window ->
+  window.preferredSize = Dimension(300, 300)
   val internet = DefaultInternet()
   val view = SwingBrowserView()
   val presenter = BrowserPresenter(view, scope, internet)

diff --git a/demo/mvp-implementation/src/main/kotlin/MvpBrowserView.kt b/demo/mvp-implementation/src/main/kotlin/MvpBrowserView.kt
@@ -21,7 +21,6 @@
 package com.xemantic.kotlin.swing.demo.mvp
 
 import com.xemantic.kotlin.swing.*
-import java.awt.Dimension
 
 /**
  * Swing implementation of the [BrowserView], could be also JavaFX, or HTML + JS or native iOS.
@@ -31,9 +30,7 @@ class SwingBrowserView : BrowserView {
   private val goAction = Button("Go!") {
     isEnabled = false
   }
-  private val contentBox = TextArea {
-    preferredSize = Dimension(300, 300)
-  }
+  private val contentBox = TextArea()
 
   override val urlEdits = urlField.textChanges
   override val goActions = goAction.actionEvents.asActions
@@ -66,7 +63,7 @@ class SwingBrowserView : BrowserView {
         }
       }
       center {
-        contentBox
+        ScrollPane { contentBox }
       }
     }
   }

diff --git a/demo/simple-kotlin-dsl/src/main/kotlin/MyBrowserKotlin.kt b/demo/simple-kotlin-dsl/src/main/kotlin/MyBrowserKotlin.kt
@@ -25,12 +25,10 @@ import kotlinx.coroutines.flow.*
 import java.awt.Dimension
 import java.net.URI
 
-fun main() = MainWindow("My Browser") {
+fun main() = MainWindow("My Browser") { window ->
   val urlBox = TextField()
   val goButton = Button("Go!") { isEnabled = false }
-  val contentBox = TextArea {
-    preferredSize = Dimension(300, 300)
-  }
+  val contentBox = TextArea()
 
   urlBox.textChanges.listen { url ->
     goButton.isEnabled = url.isNotBlank()
@@ -57,6 +55,8 @@ fun main() = MainWindow("My Browser") {
       goButton.isEnabled = true
     }
 
+  window.preferredSize = Dimension(300, 300)
+
   Border.empty(4) {
     BorderPanel {
       layout {

diff --git a/docs/xemantic-kotlin-swing-dsl-example.png b/docs/xemantic-kotlin-swing-dsl-example.png