@@ -8,6 +8,7 @@ def __init__(self, ownerComp):
8
8
self .popDialog = ownerComp .op ('popDialog' )
9
9
self .newCOMP = None
10
10
self .selected = None
11
+ #
11
12
12
13
def undoCollapse (self , isUndo , _return ):
13
14
ui .panes .current .owner = _return
@@ -25,9 +26,12 @@ def OnCollapse(self, customize=False):
25
26
self .collapse ()
26
27
pass
27
28
28
- def collapse (self , _name = None , _shortcut = None ):
29
+ def collapse (self , _name = None , _shortcut = None , ok_by_enter = False ):
29
30
ui .undo .startBlock ('Collapsing' )
30
31
ui .undo .addCallback (self .undoCollapse , info = ui .panes .current .owner )
32
+
33
+ if not self .selected or ok_by_enter :
34
+ return #
31
35
self .selected [0 ].parent ().collapseSelected ()
32
36
self .newCOMP = ui .panes .current .owner .currentChild
33
37
@@ -47,7 +51,12 @@ def collapse(self, _name=None, _shortcut=None):
47
51
48
52
def OnCustomizeCallback (self , info ):
49
53
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 )
51
60
52
61
53
62
0 commit comments