From dc40fbff7bb52351ec3fcc223d39ada4ceca6f30 Mon Sep 17 00:00:00 2001
From: leca <leca@foxarmy.org>
Date: Thu, 11 Apr 2024 15:19:35 +0300
Subject: [PATCH] cleanup & closing app on window close

---
 src/main.rs | 57 +++++++++++++++++++++++------------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 3e539ab..d09d2d9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,11 +6,10 @@ mod widgets;
 use crate::ui::menu::MenuScene;
 
 use gtk::glib::closure_local;
-use gtk::prelude::*;
+use gtk::{prelude::*, Window};
 use gtk::{gio, glib, Application, Button};
 use ui::cards::edit::MemoryCardsEditScene;
 use ui::cards::game::MemoryCardsGameScene;
-use ui::cards::new::MemoryCardsNewScene;
 use ui::cards::setup::MemoryCardsSetupScene;
 use ui::guessing::game::GuessingScene;
 use ui::guessing::setup::GuessingSetupScene;
@@ -24,7 +23,6 @@ enum AppWindow {
     MemoryCardsSetupScene = 4,
     MemoryCardsEditScene = 5,
     MemoryCardsGameScene = 6,
-    // MemoryCardsNewScene = 7,
 }
 
 const APP_ID: &str = "org.foxarmy.learn-hieroglyph";
@@ -59,7 +57,6 @@ fn build_ui(app: &Application) {
     let memory_cards_setup: MemoryCardsSetupScene = MemoryCardsSetupScene::new(app); // 4
     let memory_cards_edit: MemoryCardsEditScene = MemoryCardsEditScene::new(app); // 5
     let memory_cards_game: MemoryCardsGameScene = MemoryCardsGameScene::new(app); // 6
-    let _memory_cards_new: MemoryCardsNewScene = MemoryCardsNewScene::new(app); //7
 
     menu.get_guessing_button().connect_closure(
         "clicked",
@@ -102,8 +99,17 @@ fn build_ui(app: &Application) {
             }
         ),
     );
-
-
+    
+    guessing_scene.get_back_button().connect_closure(
+        "clicked",
+        false,
+        closure_local!(
+            @strong app => move |_b: &Button| {
+                switch_to(&app, AppWindow::GuessingSetupScene);
+            }
+        ),
+    );
+    
     memory_cards_setup.get_edit_button().connect_closure(
         "clicked",
         false,
@@ -156,32 +162,19 @@ fn build_ui(app: &Application) {
     );
 
 
-    guessing_scene.get_back_button().connect_closure(
-        "clicked",
-        false,
-        closure_local!(
-            @strong app => move |_b: &Button| {
-                switch_to(&app, AppWindow::GuessingSetupScene);
-            }
-        ),
-    );
-
-
-
-
-    // memory_cards_edit.get_add_button().connect_closure(
-    //     "clicked",
-    //     false,
-    //     closure_local!(
-    //         @strong app => move |_b: &Button| {
-    //             switch_to(&app, AppWindow::MemoryCardsNewScene);
-    //             hide_all_windows(&app);
-    //             app.window_by_id(7).unwrap().set_visible(true); // to memory card new scene
-    //         }
-    //     ),
-    // );
-
-
+    connect_close_requrest(app, menu.upcast_ref::<Window>());
+    connect_close_requrest(app, guessing_setup.upcast_ref::<Window>());
+    connect_close_requrest(app, guessing_scene.upcast_ref::<Window>());
+    connect_close_requrest(app, memory_cards_setup.upcast_ref::<Window>());
+    connect_close_requrest(app, memory_cards_edit.upcast_ref::<Window>());
+    connect_close_requrest(app, memory_cards_game.upcast_ref::<Window>());
 
     menu.present();
 }
+
+fn connect_close_requrest<W: IsA<Window>>(app: &Application, w: &W) {
+    w.connect_closure("close-request", false, closure_local!(@strong app => move |_w: &Window| {
+        app.quit();
+        true
+    }));
+}
\ No newline at end of file