From cd7f4f4587b9c9fb00eeb4130939b0245f8498f4 Mon Sep 17 00:00:00 2001
From: Igor Demin <igordmn@gmail.com>
Date: Tue, 22 Jun 2021 11:48:45 +0300
Subject: [PATCH] Migrate desktop templates/tutorials to 0.5.0-build226

---
 .../Tray_Notifications_MenuBar_new/README.md  |  3 ++-
 tutorials/Window_API_new/README.md            | 22 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/tutorials/Tray_Notifications_MenuBar_new/README.md b/tutorials/Tray_Notifications_MenuBar_new/README.md
index 6f3a15e7f2..0d6f7b9744 100644
--- a/tutorials/Tray_Notifications_MenuBar_new/README.md
+++ b/tutorials/Tray_Notifications_MenuBar_new/README.md
@@ -38,6 +38,7 @@ fun main() = application {
 
     if (isOpen) {
         Window(
+            onCloseRequest = ::exitApplication,
             icon = remember { getMyAppIcon() }
         ) {
             val trayState = rememberTrayState()
@@ -136,7 +137,7 @@ fun main() {
         if (isOpen) {
             var isSubmenuShowing by remember { mutableStateOf(false) }
 
-            Window {
+            Window(onCloseRequest = { isOpen = false }) {
                 MenuBar {
                     Menu("Actions") {
                         Item(
diff --git a/tutorials/Window_API_new/README.md b/tutorials/Window_API_new/README.md
index ad8c4b2af1..5a9122120f 100644
--- a/tutorials/Window_API_new/README.md
+++ b/tutorials/Window_API_new/README.md
@@ -147,11 +147,11 @@ import java.awt.image.BufferedImage
 
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() = application {
-    val state = rememberWindowState()
+    var isVisible by remember { mutableStateOf(true) }
 
     Window(
-        onCloseRequest = { state.isVisible = false },
-        state,
+        onCloseRequest = { isVisible = false },
+        visible = isVisible,
         title = "Counter",
     ) {
         var counter by remember { mutableStateOf(0) }
@@ -164,13 +164,13 @@ fun main() = application {
         Text(counter.toString())
     }
 
-    if (!state.isVisible && state.isOpen) {
+    if (!isVisible) {
         Tray(
             remember { getTrayIcon() },
             hint = "Counter",
-            onAction = { state.isVisible = true },
+            onAction = { isVisible = true },
             menu = {
-                Item("Exit", onClick = { state.isOpen = false })
+                Item("Exit", onClick = ::exitApplication)
             },
         )
     }
@@ -273,6 +273,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.WindowPlacement
+import androidx.compose.ui.window.WindowPosition
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 
@@ -429,12 +430,17 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogState
 import androidx.compose.ui.window.Window
+import androidx.compose.ui.window.WindowPosition
+import androidx.compose.ui.window.WindowState
 import androidx.compose.ui.window.application
 
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() = application {
-    Window {
+    Window(
+        onCloseRequest = ::exitApplication,
+    ) {
         var isDialogOpen by remember { mutableStateOf(false) }
 
         Button(onClick = { isDialogOpen = true }) {
@@ -444,7 +450,7 @@ fun main() = application {
         if (isDialogOpen) {
             Dialog(
                 onCloseRequest = { isDialogOpen = false },
-                initialAlignment = Alignment.Center
+                state = DialogState(position = WindowPosition(Alignment.Center))
             ) {
                 // Dialog's content
             }