From caa7bf44c9a1af189c28831f0f65889e8caa9b9e Mon Sep 17 00:00:00 2001
From: Amr Bashir <48618675+amrbashir@users.noreply.github.com>
Date: Thu, 29 Jul 2021 14:50:18 +0200
Subject: [PATCH] refactor(core/wry): use `is_menu_visible` instead of atomic
 bool (#2320)

---
 core/tauri-runtime-wry/src/lib.rs | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/core/tauri-runtime-wry/src/lib.rs b/core/tauri-runtime-wry/src/lib.rs
index 70f681b18..8057ba169 100644
--- a/core/tauri-runtime-wry/src/lib.rs
+++ b/core/tauri-runtime-wry/src/lib.rs
@@ -1198,8 +1198,6 @@ struct WebviewWrapper {
   inner: WebView,
   #[cfg(feature = "menu")]
   menu_items: HashMap<u16, WryCustomMenuItem>,
-  #[cfg(feature = "menu")]
-  is_menu_visible: AtomicBool,
 }
 
 /// A Tauri [`Runtime`] wrapper around wry.
@@ -1699,9 +1697,7 @@ fn handle_event_loop(
             WindowMessage::IsResizable(tx) => tx.send(window.is_resizable()).unwrap(),
             WindowMessage::IsVisible(tx) => tx.send(window.is_visible()).unwrap(),
             #[cfg(feature = "menu")]
-            WindowMessage::IsMenuVisible(tx) => tx
-              .send(webview.is_menu_visible.load(Ordering::Relaxed))
-              .unwrap(),
+            WindowMessage::IsMenuVisible(tx) => tx.send(window.is_menu_visible()).unwrap(),
             WindowMessage::CurrentMonitor(tx) => tx.send(window.current_monitor()).unwrap(),
             WindowMessage::PrimaryMonitor(tx) => tx.send(window.primary_monitor()).unwrap(),
             WindowMessage::AvailableMonitors(tx) => {
@@ -1733,15 +1729,9 @@ fn handle_event_loop(
             WindowMessage::Minimize => window.set_minimized(true),
             WindowMessage::Unminimize => window.set_minimized(false),
             #[cfg(feature = "menu")]
-            WindowMessage::ShowMenu => {
-              window.show_menu();
-              webview.is_menu_visible.store(true, Ordering::Relaxed);
-            }
+            WindowMessage::ShowMenu => window.show_menu(),
             #[cfg(feature = "menu")]
-            WindowMessage::HideMenu => {
-              window.hide_menu();
-              webview.is_menu_visible.store(false, Ordering::Relaxed);
-            }
+            WindowMessage::HideMenu => window.hide_menu(),
             WindowMessage::Show => window.set_visible(true),
             WindowMessage::Hide => window.set_visible(false),
             WindowMessage::Close => {
@@ -2062,8 +2052,6 @@ fn create_webview(
     inner: webview,
     #[cfg(feature = "menu")]
     menu_items,
-    #[cfg(feature = "menu")]
-    is_menu_visible: AtomicBool::new(true),
   })
 }