menu::on_close()

gagistech · Sep 17, 2024 · c4e1fd6 · c4e1fd6
1 parent 3dd223e
commit c4e1fd6
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 4 deletions.
diff --git a/src/bedsidemon/application.cpp b/src/bedsidemon/application.cpp
@@ -176,5 +176,6 @@ void bedsidemon::application::close_menu()
 		return;
 	}
 	this->menu->remove_from_parent();
+	this->menu->on_close();
 	this->menu.reset();
 }
diff --git a/src/bedsidemon/menu.hpp b/src/bedsidemon/menu.hpp
@@ -33,6 +33,8 @@ class menu : public ruis::nine_patch
 		std::u32string title,
 		utki::span<const utki::shared_ref<ruis::widget>> contents
 	);
+
+	virtual void on_close() {}
 };
 
 } // namespace bedsidemon
diff --git a/src/bedsidemon/spo2/spo2_parameter_window.cpp b/src/bedsidemon/spo2/spo2_parameter_window.cpp
@@ -266,7 +266,7 @@ spo2_parameter_window::spo2_parameter_window(utki::shared_ref<ruis::context> con
 				// menu is already open
 				return;
 			}
-			auto pwm = utki::make_shared<spo2_parameter_window_menu>(this->context);
+			auto pwm = utki::make_shared<spo2_parameter_window_menu>(this->context, utki::make_weak_from(*this));
 			this->pw_menu = pwm;
 			application::inst().open_menu(pwm);
 		};

diff --git a/src/bedsidemon/spo2/spo2_parameter_window.hpp b/src/bedsidemon/spo2/spo2_parameter_window.hpp
@@ -37,6 +37,8 @@ class spo2_parameter_window :
 	virtual public ruis::widget, //
 	private ruis::container
 {
+	friend class spo2_parameter_window_menu;
+
 	ruis::text& spo2_value;
 	ruis::text& bpm_value;
 	ruis::widget& heart;

diff --git a/src/bedsidemon/spo2/spo2_parameter_window_menu.cpp b/src/bedsidemon/spo2/spo2_parameter_window_menu.cpp
@@ -21,6 +21,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "spo2_parameter_window_menu.hpp"
 
+#include "spo2_parameter_window.hpp"
+
 using namespace std::string_literals;
 
 using namespace bedsidemon;
@@ -36,7 +38,10 @@ std::vector<utki::shared_ref<ruis::widget>> make_menu_contents(utki::shared_ref<
 }
 } // namespace
 
-spo2_parameter_window_menu::spo2_parameter_window_menu(utki::shared_ref<ruis::context> context) :
+spo2_parameter_window_menu::spo2_parameter_window_menu(
+	utki::shared_ref<ruis::context> context, //
+	std::weak_ptr<spo2_parameter_window> spo2_pw
+) :
 	// clang-format off
     ruis::widget(
         std::move(context),
@@ -49,6 +54,17 @@ spo2_parameter_window_menu::spo2_parameter_window_menu(utki::shared_ref<ruis::co
         this->context, //
         U"SpO2"s,
         make_menu_contents(this->context)
-    )
+    ),
+    spo2_pw(std::move(spo2_pw))
 // clang-format on
 {}
+
+void spo2_parameter_window_menu::on_close()
+{
+	auto pw = this->spo2_pw.lock();
+	if (!pw) {
+		return;
+	}
+
+	pw->pw_menu.reset();
+}
diff --git a/src/bedsidemon/spo2/spo2_parameter_window_menu.hpp b/src/bedsidemon/spo2/spo2_parameter_window_menu.hpp
@@ -24,11 +24,19 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "../menu.hpp"
 
 namespace bedsidemon {
+class spo2_parameter_window;
 
 class spo2_parameter_window_menu : public menu
 {
+	std::weak_ptr<spo2_parameter_window> spo2_pw;
+
 public:
-	spo2_parameter_window_menu(utki::shared_ref<ruis::context> context);
+	spo2_parameter_window_menu(
+		utki::shared_ref<ruis::context> context, //
+		std::weak_ptr<spo2_parameter_window> spo2_pw
+	);
+
+	void on_close() override;
 };
 
 } // namespace bedsidemon