Skip to content

Commit 9b47ecf

Browse files
fixed QuickCollapse when accepting by enter
TODO: check windows
1 parent 778f3ba commit 9b47ecf

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed
600 Bytes
Binary file not shown.
24 Bytes
Binary file not shown.

scripts/QuickCollapse/ExtQuickCollapse.py

+11-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ def __init__(self, ownerComp):
88
self.popDialog = ownerComp.op('popDialog')
99
self.newCOMP = None
1010
self.selected = None
11+
#
1112

1213
def undoCollapse(self, isUndo, _return):
1314
ui.panes.current.owner = _return
@@ -25,9 +26,12 @@ def OnCollapse(self, customize=False):
2526
self.collapse()
2627
pass
2728

28-
def collapse(self, _name=None, _shortcut=None):
29+
def collapse(self, _name=None, _shortcut=None, ok_by_enter=False):
2930
ui.undo.startBlock('Collapsing')
3031
ui.undo.addCallback(self.undoCollapse, info = ui.panes.current.owner)
32+
33+
if not self.selected or ok_by_enter:
34+
return#
3135
self.selected[0].parent().collapseSelected()
3236
self.newCOMP = ui.panes.current.owner.currentChild
3337

@@ -47,7 +51,12 @@ def collapse(self, _name=None, _shortcut=None):
4751

4852
def OnCustomizeCallback(self, info):
4953
if info['buttonNum'] == 1:
50-
self.collapse(_name=info['enteredText'][0], _shortcut=info['enteredText'][1])
54+
# we need to check if `OK` was pressed by enter key ### might be only for Mac???
55+
# TODO: check if this is the case for Windows
56+
key = self.ownerComp.op('keyboardin1')[1,'key'].val
57+
ok_by_enter = key == 'enter'
58+
59+
self.collapse(_name=info['enteredText'][0], _shortcut=info['enteredText'][1], ok_by_enter=ok_by_enter)
5160

5261

5362

0 commit comments

Comments
 (0)