Fix R-Click in list controls

Author: facelessuser

docs/src/markdown/about/changelog.md

@@ -5,6 +5,7 @@
 -   **NEW**: Drop Python 3.8 support.
 -   **NEW**: Upgrade dependencies to pick up bug fixes.
 -   **FIX**: Custom focus is not needed to focus the app from macOS dock anymore.
+-   **FIX**: Fix some issues with context menu right click selection in list controls.
 
 ## 4.21.2
 

rummage/lib/gui/controls/result_lists.py

@@ -60,6 +60,13 @@
 COPY_CONTENT = 2
 
 
+def display_menu(obj, m, p):
+    """Display menu."""
+
+    obj.PopupMenu(m, p)
+    m.Destroy()
+
+
 class ContextMenu(wx.Menu):
     """Context Menu."""
 
@@ -490,10 +497,9 @@ def on_rclick(self, event):
                 # Select if not already
                 if not selected:
                     s = self.GetFirstSelected()
-                    while s != -1:
-                        if s != item:
-                            self.Select(s, False)
-                        s = self.GetNextSelected(s)
+                    if s == -1:
+                        self.Select(item, True)
+
         if target is not None:
             if not enabled:
                 item = -1
@@ -522,8 +528,8 @@ def on_rclick(self, event):
                     )
                 ]
             )
-            self.PopupMenu(menu, pos)
-            menu.Destroy()
+
+            wx.CallLater(1, lambda obj=self, m=menu, p=pos: display_menu(obj, m, p))
         event.Skip()
 
 
@@ -807,10 +813,9 @@ def on_rclick(self, event):
                 # Select if not already
                 if not selected:
                     s = self.GetFirstSelected()
-                    while s != -1:
-                        if s != item:
-                            self.Select(s, False)
-                        s = self.GetNextSelected(s)
+                    if s == -1:
+                        self.Select(item, True)
+
         if target is not None:
             if not enabled:
                 item = -1
@@ -840,6 +845,5 @@ def on_rclick(self, event):
                     )
                 ]
             )
-            self.PopupMenu(menu, pos)
-            menu.Destroy()
+            wx.CallLater(1, lambda obj=self, m=menu, p=pos: display_menu(obj, m, p))
         event.Skip()

rummage/lib/gui/data/docs/.dochash

@@ -1 +1 @@
-0090421356720261e08b802a9c5f44a9
+373dd3370b7e5a84494d1b170b10d294

rummage/lib/gui/data/docs/about/changelog.html

@@ -30,6 +30,7 @@ <h2 id="422">4.22</h2>
 <li><strong>NEW</strong>: Drop Python 3.8 support.</li>
 <li><strong>NEW</strong>: Upgrade dependencies to pick up bug fixes.</li>
 <li><strong>FIX</strong>: Custom focus is not needed to focus the app from macOS dock anymore.</li>
+<li><strong>FIX</strong>: Fix some issues with context menu right click selection in list controls.</li>
 </ul>
 <h2 id="4212">4.21.2</h2>
 <ul>

rummage/lib/gui/dialogs/delete_dialog.py

@@ -198,7 +198,7 @@ def on_idle(self, event):
         if self.processing and not self.handling:
             self.handling = True
             count = self.thread.count
-            ratio = float(count) / float(self.total)
+            ratio = (float(count) / float(self.total)) if self.total else 0
             percent = int(ratio * 100)
             self.m_progress.SetValue(percent)
             self.m_progress_label.SetLabel(self.message % (count, self.total))