Merge remote-tracking branch 'origin/master'

Author: HenriWahl

Nagstamon/QUI/__init__.py

@@ -411,9 +411,11 @@ def icon_clicked(self, reason):
         if reason in (QSystemTrayIcon.ActivationReason.Trigger,
                       QSystemTrayIcon.ActivationReason.DoubleClick,
                       QSystemTrayIcon.ActivationReason.MiddleClick):
-            # when green icon is displayed and no popwin is about to pop up show at least menu
-            if get_worst_status() == 'UP' and OS == OS_DARWIN:
-                self.menu.show_at_cursor()
+            # when green icon is displayed and no popwin is about to pop up...
+            if get_worst_status() == 'UP':
+                # ...nothing to do except on macOS where menu should be shown
+                if OS == OS_DARWIN:
+                    self.menu.show_at_cursor()
             else:
                 # show status window if there is something to tell
                 if statuswindow.is_shown:
@@ -1678,7 +1680,6 @@ def calculate_size(self):
             # where is the pointer which clicked onto systray icon
             icon_x = systrayicon.geometry().x()
             icon_y = systrayicon.geometry().y()
-
             if OS in OS_NON_LINUX:
                 if self.icon_x == 0:
                     self.icon_x = QCursor.pos().x()
@@ -1694,6 +1695,7 @@ def calculate_size(self):
 
             if icon_y == 0 and self.icon_y == 0:
                 self.icon_y = QCursor.pos().y()
+
             if OS in OS_NON_LINUX:
                 if self.icon_y == 0:
                     self.icon_y = QCursor.pos().y()
@@ -1705,6 +1707,7 @@ def calculate_size(self):
             available_height = self.screen().availableGeometry().height() - conf.systray_offset
         else:
             available_height = self.screen().availableGeometry().height()
+
         available_width = self.screen().availableGeometry().width()
         available_x = self.screen().availableGeometry().x()
         available_y = self.screen().availableGeometry().y()
@@ -1716,8 +1719,6 @@ def calculate_size(self):
             if available_y == 0:
                 available_y = available_height
 
-        # del (screen_or_widget)
-
         # take whole screen height into account when deciding about upper/lower-ness
         # add available_y because it might vary on differently setup screens
         # calculate top-ness only if window is closed
@@ -1771,7 +1772,7 @@ def calculate_size(self):
 
             # when statusbar hangs around in lowermost part of current screen extend from bottom to top
             else:
-                # when height is to large for current screen cut it
+                # when height is too large for current screen cut it
                 if self.y() + self.height() - real_height < available_y:
                     height = self.screen().geometry().height() - available_y - (
                             self.screen().geometry().height() - (self.y() + self.height()))
@@ -1792,19 +1793,26 @@ def calculate_size(self):
                     height = available_height - available_y
             # when statusbar hangs around in lowermost part of current screen extend from bottom to top
             else:
-                # when height is to large for current screen cut it
-                if self.y() + self.height() - real_height < available_y:
-                    # simply take the available max height if there is no more screen real estate
-                    # possible because systrayicon resides aside from available space, in fact cutting it
+                ## when height is too large for current screen cut it
+                # if self.y() + self.height() - real_height < available_y:
+                #     # simply take the available max height if there is no more screen real estate
+                #     # possible because systrayicon resides aside from available space, in fact cutting it
+                #     height = available_height
+                #     y = available_height - height
+                # else:
+                #     if available_height < real_height:
+                #         y = available_y
+                #         height = available_height
+                #     else:
+                #         y = available_height - real_height
+                #         height = real_height
+
+                if available_height < real_height:
+                    y = available_y
                     height = available_height
-                    y = available_height - height
                 else:
-                    if available_height < real_height:
-                        y = available_y
-                        height = available_height
-                    else:
-                        y = available_height - real_height
-                        height = real_height
+                    y = available_height - real_height
+                    height = real_height
 
         return width, height, x, y
 
@@ -1914,12 +1922,21 @@ def leaveEvent(self, event):
         """
             check if popup has to be hidden depending on mouse position
         """
+        # depending on display mode the leave time offset shall be different because
+        # it may be too short in systray mode and lead to flickering window
+        if conf.statusbar_floating:
+            leave_time_offset = 0.25
+        elif conf.icon_in_systray:
+            # offset is max 1 and smaller if window is smaller too
+            leave_time_offset = self.height() / self.screen().availableGeometry().height()
+        else:
+            leave_time_offset = 0
 
         # check first if popup has to be shown by hovering or clicking
         if conf.close_details_hover and \
                 not conf.fullscreen and \
                 not conf.windowed and \
-                self.is_shown_timestamp + 0.25 < time.time():
+                self.is_shown_timestamp + leave_time_offset < time.time():
             # only hide window if cursor is outside of it
             mouse_x = QCursor.pos().x()
             mouse_y = QCursor.pos().y()
@@ -1928,8 +1945,6 @@ def leaveEvent(self, event):
                     mouse_y <= self.y() or mouse_y >= self.y() + self.height():
                 self.hide_window()
 
-            del (mouse_x, mouse_y)
-
     def closeEvent(self, event):
         """
             window close