From c01b4da33ddf4aa884b758fd353dedeb69f383c8 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 15 Oct 2021 18:55:53 -0700
Subject: [PATCH] Update infi.systray fork

From https://github.com/JonnyWong16/infi.systray.git@develop
---
 lib/infi/__init__.py                    | 1 +
 lib/{ => infi}/systray/__init__.py      | 0
 lib/{ => infi}/systray/traybar.py       | 5 +++--
 lib/{ => infi}/systray/win32_adapter.py | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 lib/infi/__init__.py
 rename lib/{ => infi}/systray/__init__.py (100%)
 rename lib/{ => infi}/systray/traybar.py (98%)
 rename lib/{ => infi}/systray/win32_adapter.py (100%)

diff --git a/lib/infi/__init__.py b/lib/infi/__init__.py
new file mode 100644
index 00000000..5284146e
--- /dev/null
+++ b/lib/infi/__init__.py
@@ -0,0 +1 @@
+__import__("pkg_resources").declare_namespace(__name__)
diff --git a/lib/systray/__init__.py b/lib/infi/systray/__init__.py
similarity index 100%
rename from lib/systray/__init__.py
rename to lib/infi/systray/__init__.py
diff --git a/lib/systray/traybar.py b/lib/infi/systray/traybar.py
similarity index 98%
rename from lib/systray/traybar.py
rename to lib/infi/systray/traybar.py
index 49e73522..9dc588ca 100644
--- a/lib/systray/traybar.py
+++ b/lib/infi/systray/traybar.py
@@ -174,9 +174,10 @@ class SysTrayIcon(object):
         # Try and find a custom icon
         hicon = 0
         if self._icon is not None and os.path.isfile(self._icon):
-            icon_flags = LR_LOADFROMFILE | LR_DEFAULTSIZE
+            ico_x = GetSystemMetrics(SM_CXSMICON)
+            ico_y = GetSystemMetrics(SM_CYSMICON)
             icon = encode_for_locale(self._icon)
-            hicon = self._hicon = LoadImage(0, icon, IMAGE_ICON, 0, 0, icon_flags)
+            hicon = self._hicon = LoadImage(0, icon, IMAGE_ICON, ico_x, ico_y, LR_LOADFROMFILE)
             self._icon_shared = False
 
         # Can't find icon file - using default shared icon
diff --git a/lib/systray/win32_adapter.py b/lib/infi/systray/win32_adapter.py
similarity index 100%
rename from lib/systray/win32_adapter.py
rename to lib/infi/systray/win32_adapter.py
index 7850b8f9..9da8152d 100644
--- a/lib/systray/win32_adapter.py
+++ b/lib/infi/systray/win32_adapter.py
@@ -42,8 +42,8 @@ NIM_DELETE = 2
 NIF_ICON = 2
 NIF_MESSAGE = 1
 NIF_TIP = 4
-MIIM_STATE = 1
 MIIM_ID = 2
+MIIM_STATE = 1
 MIIM_SUBMENU = 4
 MIIM_STRING = 64
 MIIM_BITMAP = 128