Merge branch 'button-focus' of https://github.com/hordepfo/mintmenu into hordepfo-button-focus
Conflicts: usr/lib/linuxmint/mintMenu/plugins/applications.py
This commit is contained in:
commit
c93ffb2ffe
@ -879,11 +879,12 @@ class pluginclass( object ):
|
||||
i.released()
|
||||
i.set_relief( Gtk.ReliefStyle.NONE )
|
||||
widget.set_relief( Gtk.ReliefStyle.HALF )
|
||||
widget.grab_focus()
|
||||
|
||||
self.searchEntry.set_text( "" )
|
||||
|
||||
self.applicationsScrolledWindow.get_vadjustment().set_value( 0 )
|
||||
|
||||
def FilterAndClear( self, widget, category = None ):
|
||||
self.searchEntry.set_text( "" )
|
||||
self.Filter( widget, category )
|
||||
|
||||
# Forward all text to the search box
|
||||
def keyPress( self, widget, event ):
|
||||
@ -1124,7 +1125,7 @@ class pluginclass( object ):
|
||||
#menu.reposition()
|
||||
#self.mintMenuWin.grab()
|
||||
menu.connect( 'deactivate', self.onMenuPopupDeactivate)
|
||||
#self.focusSearchEntry()
|
||||
|
||||
return True
|
||||
|
||||
def pos_func(self, menu=None):
|
||||
@ -1680,7 +1681,7 @@ class pluginclass( object ):
|
||||
else:
|
||||
item["button"].mouseOverHandlerIds = None
|
||||
|
||||
item["button"].connect( "clicked", self.Filter, item["filter"] )
|
||||
item["button"].connect( "clicked", self.FilterAndClear, item["filter"] )
|
||||
item["button"].connect( "focus-in-event", self.categoryBtnFocus, item["filter"] )
|
||||
item["button"].show()
|
||||
|
||||
|
@ -283,7 +283,6 @@ class ApplicationLauncher( easyButton ):
|
||||
|
||||
self.connectSelf( "focus-in-event", self.onFocusIn )
|
||||
self.connectSelf( "focus-out-event", self.onFocusOut )
|
||||
self.connectSelf( "enter-notify-event", self.onEnterNotify )
|
||||
self.connectSelf( "clicked", self.execute )
|
||||
|
||||
|
||||
@ -332,9 +331,6 @@ class ApplicationLauncher( easyButton ):
|
||||
def onFocusOut( self, widget, event ):
|
||||
self.set_relief( Gtk.ReliefStyle.NONE )
|
||||
|
||||
def onEnterNotify( self, widget, event ):
|
||||
self.grab_focus()
|
||||
|
||||
def setupLabels( self ):
|
||||
self.addLabel( self.appName )
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user