Skip to content

Input Gestures dialog: Async filtering for smoother response #10307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feerrenrut merged 8 commits into from
Jul 2, 2020
Merged

Input Gestures dialog: Async filtering for smoother response #10307

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
946f732
Input Gestures dialog: Delay applying filter for smoother response
JulienCochuyt Oct 1, 2019
52f3e04
Merge branch 'master' into inputGesturesFilterDelay
JulienCochuyt Oct 5, 2019
80e3fc6
Input Gestures dialog: Refactor using VirtualTree
JulienCochuyt Oct 5, 2019
f594f79
Merge branch 'master' into inputGesturesFilterDelay
JulienCochuyt Oct 28, 2019
927691c
Input Gestures dialog: Expand categories only if there are few results
JulienCochuyt Oct 28, 2019
432ef35
Input Gestures dialog: Add explanatory comment
JulienCochuyt Oct 29, 2019
ba1e208
Merge branch 'master' into inputGesturesFilterDelay
JulienCochuyt Nov 18, 2019
3fc2f4a
Merge branch 'master' into inputGesturesFilterDelay
JulienCochuyt May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Input Gestures dialog: Delay applying filter for smoother response
  • Loading branch information
@JulienCochuyt
JulienCochuyt committed Oct 1, 2019
commit 946f7323577c86597984478f37f1006e333f685b
19 changes: 17 additions & 2 deletions source/gui/settingsDialogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3242,6 +3242,7 @@ class InputGesturesDialog(SettingsDialog):
title = _("Input Gestures")

def __init__(self, parent):
self.populateTreeTimer = None
super().__init__(parent, resizeable=True)

def makeSettings(self, settingsSizer):
Expand Down Expand Up @@ -3287,13 +3288,28 @@ def makeSettings(self, settingsSizer):
def postInit(self):
self.tree.SetFocus()

def populateTree(self, filter=''):
POPULATE_TREE_DELAY_MS = 300

def populateTree(self, *args, **kwargs):
def delayedCall(*args, **kwargs):
self.tree.Freeze()
try:
self._populateTree(*args, **kwargs)
finally:
self.tree.Thaw()
if self.populateTreeTimer is None:
self.populateTreeTimer = wx.CallLater(self.POPULATE_TREE_DELAY_MS, delayedCall, *args, **kwargs)
else:
self.populateTreeTimer.Start(self.POPULATE_TREE_DELAY_MS, *args, **kwargs)

def _populateTree(self, filter=''):
if filter:
#This regexp uses a positive lookahead (?=...) for every word in the filter, which just makes sure the word is present in the string to be tested without matching position or order.
# #5060: Escape the filter text to prevent unexpected matches and regexp errors.
# Because we're escaping, words must then be split on "\ ".
filter = re.escape(filter)
filterReg = re.compile(r'(?=.*?' + r')(?=.*?'.join(filter.split('\ ')) + r')', re.U|re.IGNORECASE)
self.tree.DeleteChildren(self.treeRoot)
for category in sorted(self.gestures):
treeCat = self.tree.AppendItem(self.treeRoot, category)
commands = self.gestures[category]
Expand All @@ -3313,7 +3329,6 @@ def populateTree(self, filter=''):

def onFilterChange(self, evt):
filter=evt.GetEventObject().GetValue()
self.tree.DeleteChildren(self.treeRoot)
self.populateTree(filter)

def _formatGesture(self, identifier):
Expand Down