improvements on how the clock nahdles taskbar detection

marticliment · Oct 24, 2023 · d7c61be · d7c61be
1 parent decf6c4
commit d7c61be
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/ElevenClock.iss b/ElevenClock.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ElevenClock"
-#define MyAppVersion "4.3.1"
+#define MyAppVersion "4.3.2"
 #define MyAppPublisher "Martí Climent"
 #define MyAppURL "https://marticliment.com/elevenclock"
 #define MyAppExeName "ElevenClock.exe"
@@ -19,7 +19,7 @@ AppPublisher="Martí Climent"
 AppPublisherURL="https://marticliment.com/"
 AppSupportURL="https://marticliment.com/#contact"
 AppUpdatesURL="https://github.com/marticliment/ElevenClock/releases"
-VersionInfoVersion=4.3.1.0
+VersionInfoVersion=4.3.2.0
 DefaultDirName={autopf}\ElevenClock
 DisableDirPage=yes
 ChangesAssociations=yes

diff --git a/elevenclock-version-info b/elevenclock-version-info
@@ -32,8 +32,8 @@ StringFileInfo(
     [
       StringStruct(u'CompanyName', u'Martí Climent'),
       StringStruct(u'FileDescription', u'ElevenClock'),
-      StringStruct(u'FileVersion', u'4.3.1'),
-      StringStruct(u'ProductVersion', u'4.3.1'),
+      StringStruct(u'FileVersion', u'4.3.2'),
+      StringStruct(u'ProductVersion', u'4.3.2'),
       StringStruct(u'InternalName', u'ElevenClock'),
       StringStruct(u'LegalCopyright', u'Martí Climent'),
       StringStruct(u'OriginalFilename', u'elevenclock.exe'),

diff --git a/elevenclock/__init__.py b/elevenclock/__init__.py
@@ -1158,6 +1158,8 @@ def mainClockLoop(self):
 
                 print(f"🔵 Show/hide loop started with parameters: HideonFS:{ENABLE_HIDE_ON_FULLSCREEN}, NotHideOnTB:{DISABLE_HIDE_WITH_TASKBAR}, DisableNotifications:{SHOW_NOTIFICATIONS}")
 
+                ClockShownByTaskbarShow: bool = False
+
                 while True:
                     self.AWindowIsInFullScreen = self.TheresAWindowInFullscreen()
                     HideClock = False
@@ -1170,21 +1172,27 @@ def mainClockLoop(self):
                         HideClock = self.AWindowIsInFullScreen
 
                     if not HideClock and not DISABLE_HIDE_WITH_TASKBAR and self.TASKBAR_DOES_AUTOHIDE:
+
                         mousePos = getMousePos()
-                        if (mousePos.y() + 1 == self.screenGeometry.y() + self.screenGeometry.height()) and self.screenGeometry.x() < mousePos.x() and self.screenGeometry.x()+self.screenGeometry.width() > mousePos.x():
+                        if (mousePos.y() + 1 == self.screenGeometry.y() + self.screenGeometry.height()) and mousePos.x() > self.screenGeometry.x() and mousePos.x() < (self.screenGeometry.x() + self.screenGeometry.width()):
                             if self.isHidden():
-                                time.sleep(0.22)
+                                time.sleep(0.28)
                             HideClock = False
-                        elif (mousePos.y() <= self.screenGeometry.y()+self.screenGeometry.height()-self.preferedHeight):
-                            if globals.trayIcon != None:
+                            ClockShownByTaskbarShow = True
+                        elif mousePos.y() <= (self.screenGeometry.y() + self.screenGeometry.height() - self.preferedHeight - 10) and ClockShownByTaskbarShow:
+                            if globals.trayIcon is not None:
                                 menu = globals.trayIcon.contextMenu()
-                                if menu.isVisible():
-                                    HideClock = False
-                                else:
-                                    HideClock = True
+                                HideClock = not menu.isVisible()
+                                ClockShownByTaskbarShow = menu.isVisible()
                             else:
                                 HideClock = True
-
+                                ClockShownByTaskbarShow = False
+                        else:
+                            if not ClockShownByTaskbarShow:
+                                HideClock = True
+                            else:
+                                HideClock = False
+
                     if HideClock:
                         self.hideSignal.emit()
                         BackgroundUpdatesCounter = 0

diff --git a/elevenclock/versions.py b/elevenclock/versions.py
@@ -1,3 +1,3 @@
-version = 4.31
-versionName = "4.3.1"
-versionISS = "4.3.1.0"
+version = 4.32
+versionName = "4.3.2"
+versionISS = "4.3.2.0"