xenoslib 0.1.29.6__tar.gz → 0.1.29.8__tar.gz

{xenoslib-0.1.29.6/xenoslib.egg-info → xenoslib-0.1.29.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xenoslib
-Version: 0.1.29.6
+Version: 0.1.29.8
 Summary: Xenos' common lib
 Home-page: https://github.com/XenosLu/xenoslib.git
 Author: Xenocider

{xenoslib-0.1.29.6 → xenoslib-0.1.29.8}/xenoslib/__init__.py

@@ -7,4 +7,6 @@ if sys.platform == "win32":
     from .win_trayicon import *  # noqa
 elif sys.platform == "linux":
     from .linux import *  # noqa
+elif sys.platform == "darwin":
+    from .linux import *  # noqa
 from .base import *  # noqa

{xenoslib-0.1.29.6 → xenoslib-0.1.29.8}/xenoslib/about.py

@@ -4,4 +4,4 @@ __url__ = "https://github.com/XenosLu/xenoslib.git"
 __author__ = "Xenocider"
 __author_email__ = "xenos.lu@gmail.com"
 __license__ = "MIT License"
-__version__ = "0.1.29.6"
+__version__ = "0.1.29.8"

{xenoslib-0.1.29.6 → xenoslib-0.1.29.8}/xenoslib/win_trayicon.py

@@ -83,15 +83,26 @@ class MenuItemConsole(MenuItem):
         super().__init__(*args, **kwargs)
         self.hconsole = win32console.GetConsoleWindow()
 
+    def is_window_visible_not_minimized(self):
+        """返回窗口是否可见且不处于最小化状态"""
+        visible = win32gui.IsWindowVisible(self.hconsole)
+        minimized = win32gui.IsIconic(self.hconsole)
+        logger.debug(f"window visible: {visible}, window minimized: {minimized}")
+        return visible and not minimized
+
     def action(self, show=None):
         if show is None:
-            super().action()
+            # super().action()
+            self.checked = not self.is_window_visible_not_minimized()
+            # logger.info(self.checked)
         else:
             self.checked = show
         win32gui.ShowWindow(self.hconsole, self.checked)
         if self.checked:
             try:
+                # win32gui.BringWindowToTop(self.hconsole)
                 win32gui.SetForegroundWindow(self.hconsole)
+                # ctypes.windll.user32.SetForegroundWindow(self.hconsole)
             except Exception as exc:
                 logger.debug(exc, exc_info=True)
 
@@ -111,6 +122,7 @@ class SysTrayIcon:
         if not iconpath:
             python_path = os.path.dirname(os.path.abspath(sys.executable))
             iconpath = os.path.join(python_path, "DLLs", "pyd.ico")
+            logger.debug(f"Load icon from path: {iconpath}")
         if os.path.isfile(iconpath):
             hinst = win32gui.GetModuleHandle(None)
             icon_flags = win32con.LR_LOADFROMFILE | win32con.LR_DEFAULTSIZE
@@ -174,6 +186,11 @@ class SysTrayIcon:
         pos = win32gui.GetCursorPos()
         # See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/menus_0hdi.asp
         try:
+            # 获取窗口当前状态
+            placement = win32gui.GetWindowPlacement(self.hwnd)
+            # 如果窗口当前是最小化状态，则还原窗口
+            if placement[1] == win32con.SW_SHOWMINIMIZED:
+                win32gui.ShowWindow(self.hwnd, win32con.SW_RESTORE)
             win32gui.SetForegroundWindow(self.hwnd)
         except Exception as exc:
             logger.debug(exc, exc_info=True)
@@ -242,12 +259,11 @@ class SysTrayIcon:
     def on_notify_icon(self, hwnd, msg, wparam, lparam):
         """callback on catch tray icon events"""
         if lparam == win32con.WM_LBUTTONDBLCLK:
-            # self.execute_menu_option(self.FIRST_ID)
-            pass
+            self.execute_menu_option(self.FIRST_ID)
         elif lparam == win32con.WM_RBUTTONUP:
             self.draw_notify_icon()
             self.show_menu()
-        elif lparam == win32con.WM_LBUTTONUP:
+        elif lparam == win32con.WM_LBUTTONDOWN:
             self.draw_notify_icon()
             if callable(self.left_click_action):
                 self.left_click_action()

{xenoslib-0.1.29.6 → xenoslib-0.1.29.8/xenoslib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xenoslib
-Version: 0.1.29.6
+Version: 0.1.29.8
 Summary: Xenos' common lib
 Home-page: https://github.com/XenosLu/xenoslib.git
 Author: Xenocider