make Escape abort cycling
This commit is contained in:
parent
a04d9fc256
commit
741aecf842
1 changed files with 17 additions and 9 deletions
|
@ -197,9 +197,18 @@ class cycledata:
|
||||||
self.activatetarget(0) # activate, but dont deiconify/unshade/raise
|
self.activatetarget(0) # activate, but dont deiconify/unshade/raise
|
||||||
|
|
||||||
def grabfunc(self, data):
|
def grabfunc(self, data):
|
||||||
if data.action == ob.KeyAction.Release:
|
done = 0
|
||||||
# have all the modifiers this started with been released?
|
# have all the modifiers this started with been released?
|
||||||
if not self.state & data.state:
|
if (data.action == ob.KeyAction.Release and
|
||||||
|
not self.state & data.state):
|
||||||
|
done = 1
|
||||||
|
# has Escape been pressed?
|
||||||
|
if data.action == ob.KeyAction.Press and data.key == "Escape":
|
||||||
|
done = 1
|
||||||
|
# revert
|
||||||
|
self.menupos = 0
|
||||||
|
|
||||||
|
if done:
|
||||||
self.cycling = 0
|
self.cycling = 0
|
||||||
focus._disable = 0
|
focus._disable = 0
|
||||||
self.activatetarget(1) # activate, and deiconify/unshade/raise
|
self.activatetarget(1) # activate, and deiconify/unshade/raise
|
||||||
|
@ -207,7 +216,6 @@ class cycledata:
|
||||||
ob.kungrab()
|
ob.kungrab()
|
||||||
ob.mungrab()
|
ob.mungrab()
|
||||||
|
|
||||||
|
|
||||||
def _newwindow(data):
|
def _newwindow(data):
|
||||||
if _o.cycling: _o.populatelist()
|
if _o.cycling: _o.populatelist()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue