Merge pull request #81 from monsta/better-focusout-blocking
Better logic in focus-out-event blocking/unblocking
This commit is contained in:
commit
2cc7f19546
@ -87,6 +87,7 @@ class MainWindow( object ):
|
|||||||
self.window.connect( "key-press-event", self.onKeyPress )
|
self.window.connect( "key-press-event", self.onKeyPress )
|
||||||
self.window.connect( "focus-in-event", self.onFocusIn )
|
self.window.connect( "focus-in-event", self.onFocusIn )
|
||||||
self.loseFocusId = self.window.connect( "focus-out-event", self.onFocusOut )
|
self.loseFocusId = self.window.connect( "focus-out-event", self.onFocusOut )
|
||||||
|
self.loseFocusBlocked = False
|
||||||
|
|
||||||
self.window.stick()
|
self.window.stick()
|
||||||
|
|
||||||
@ -462,17 +463,9 @@ class MainWindow( object ):
|
|||||||
self.window.hide()
|
self.window.hide()
|
||||||
|
|
||||||
def onFocusIn( self, *args ):
|
def onFocusIn( self, *args ):
|
||||||
def dummy( *args ): pass
|
if self.loseFocusBlocked:
|
||||||
|
|
||||||
signalId = GObject.signal_lookup( "focus-out-event", self.window )
|
|
||||||
while True:
|
|
||||||
result = GObject.signal_handler_find( self.window,
|
|
||||||
GObject.SignalMatchType.ID | GObject.SignalMatchType.UNBLOCKED,
|
|
||||||
signalId, 0, None, dummy, dummy )
|
|
||||||
if result == 0:
|
|
||||||
self.window.handler_unblock( self.loseFocusId )
|
self.window.handler_unblock( self.loseFocusId )
|
||||||
else:
|
self.loseFocusBlocked = False
|
||||||
break
|
|
||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -482,7 +475,9 @@ class MainWindow( object ):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
def stopHiding( self ):
|
def stopHiding( self ):
|
||||||
|
if not self.loseFocusBlocked:
|
||||||
self.window.handler_block( self.loseFocusId )
|
self.window.handler_block( self.loseFocusId )
|
||||||
|
self.loseFocusBlocked = True
|
||||||
|
|
||||||
class MenuWin( object ):
|
class MenuWin( object ):
|
||||||
def __init__( self, applet, iid ):
|
def __init__( self, applet, iid ):
|
||||||
|
Loading…
Reference in New Issue
Block a user