Merge branch 'macos' of https://github.com/tr1xem/Modus into macos

modules/panel/components/menubar.py

@@ -367,6 +367,12 @@ class MenuBar(Box):
             self.dropdown_system.global_menu_button_help,
         ]
 
-    def show_system_dropdown(self, _):
-        """Show the system dropdown menu"""
-        self.dropdown_system.menu_button_dropdown.toggle_mousecapture()
+    def show_system_dropdown(self, imac_button):
+        self.dropdown_system.menu_button_dropdown.child_window.set_pointing_to(
+            imac_button
+        )
+        mouse_capture = self.dropdown_system.menu_button_dropdown
+        if mouse_capture.is_visible():
+            mouse_capture.set_child_window_visible(False)
+        else:
+            mouse_capture.set_child_window_visible(True)

modules/panel/main.py

@@ -17,12 +17,9 @@ from modules.panel.components.indicators import (
 )
 from modules.panel.components.menubar import MenuBar
 from modules.panel.components.recording_indicator import RecordingIndicator
-<<<<<<< HEAD
-=======
 
 from modules.controlcenter.main import ModusControlCenter
 from widgets.mousecapture import MouseCapture
->>>>>>> 9d83d960ef466f38bc3bc426eb89534c26b0fe04
 
 # Apply enhanced system tray icon handling
 apply_enhanced_system_tray()