Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2435 from PeterNerlich/fix-hotkeys_popup 

stop keygrabber on hide through click
This commit is contained in:
mergify[bot] 2018-12-20 04:06:17 +00:00 committed by GitHub
parent 820094c3c4 1da5554fdc
commit 7d0976912e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/awful/hotkeys_popup/widget.lua
View File

@ -443,6 +443,10 @@ function widget.new(args)
border_color = self.border_color, border_color = self.border_color,
shape = self.shape, shape = self.shape,
}) })
local widget_obj = {
current_page = 1,
wibox = mywibox,
}
mywibox:geometry({ mywibox:geometry({
x = wa.x + math.floor((wa.width - width - self.border_width*2) / 2), x = wa.x + math.floor((wa.width - width - self.border_width*2) / 2),
y = wa.y + math.floor((wa.height - height - self.border_width*2) / 2), y = wa.y + math.floor((wa.height - height - self.border_width*2) / 2),
@ -451,13 +455,10 @@ function widget.new(args)
}) })
mywibox:set_widget(pages[1]) mywibox:set_widget(pages[1])
mywibox:buttons(gtable.join( mywibox:buttons(gtable.join(
awful.button({ }, 1, function () mywibox.visible=false end), awful.button({ }, 1, function () widget_obj:hide() end),
awful.button({ }, 3, function () mywibox.visible=false end) awful.button({ }, 3, function () widget_obj:hide() end)
)) ))
local widget_obj = {}
widget_obj.current_page = 1
widget_obj.wibox = mywibox
function widget_obj.page_next(_self) function widget_obj.page_next(_self)
if _self.current_page == #pages then return end if _self.current_page == #pages then return end
_self.current_page = _self.current_page + 1 _self.current_page = _self.current_page + 1
@ -473,6 +474,9 @@ function widget.new(args)
end end
function widget_obj.hide(_self) function widget_obj.hide(_self)
_self.wibox.visible = false _self.wibox.visible = false
if _self.keygrabber then
awful.keygrabber.stop(_self.keygrabber)
end
end end
return widget_obj return widget_obj
@ -526,7 +530,7 @@ function widget.new(args)
local help_wibox = self._cached_wiboxes[s][joined_groups] local help_wibox = self._cached_wiboxes[s][joined_groups]
help_wibox:show() help_wibox:show()
return awful.keygrabber.run(function(_, key, event) help_wibox.keygrabber = awful.keygrabber.run(function(_, key, event)
if event == "release" then return end if event == "release" then return end
if key then if key then
if key == "Next" then if key == "Next" then
@ -534,11 +538,11 @@ function widget.new(args)
elseif key == "Prior" then elseif key == "Prior" then
help_wibox:page_prev() help_wibox:page_prev()
else else
awful.keygrabber.stop()
help_wibox:hide() help_wibox:hide()
end end
end end
end) end)
return help_wibox.keygrabber
end end
--- Add hotkey descriptions for third-party applications. --- Add hotkey descriptions for third-party applications.