refactor(awful: widget: calendar_popup): s/_calendar_clicked/_calendar_clicked_on/
This commit is contained in:
parent
23613bac05
commit
c9fbecd1e8
|
@ -256,24 +256,24 @@ function calendar_popup:attach(widget, position, args)
|
||||||
if args.on_hover == nil then args.on_hover=true end
|
if args.on_hover == nil then args.on_hover=true end
|
||||||
widget:buttons(gears.table.join(
|
widget:buttons(gears.table.join(
|
||||||
abutton({ }, 1, function ()
|
abutton({ }, 1, function ()
|
||||||
if not self.visible or self._calendar_clicked then
|
if not self.visible or self._calendar_clicked_on then
|
||||||
self:call_calendar(0, position)
|
self:call_calendar(0, position)
|
||||||
self.visible = not self.visible
|
self.visible = not self.visible
|
||||||
end
|
end
|
||||||
self._calendar_clicked = self.visible
|
self._calendar_clicked_on = self.visible
|
||||||
end),
|
end),
|
||||||
abutton({ }, 4, function () self:call_calendar(-1) end),
|
abutton({ }, 4, function () self:call_calendar(-1) end),
|
||||||
abutton({ }, 5, function () self:call_calendar( 1) end)
|
abutton({ }, 5, function () self:call_calendar( 1) end)
|
||||||
))
|
))
|
||||||
if args.on_hover then
|
if args.on_hover then
|
||||||
widget:connect_signal("mouse::enter", function ()
|
widget:connect_signal("mouse::enter", function ()
|
||||||
if not self._calendar_clicked then
|
if not self._calendar_clicked_on then
|
||||||
self:call_calendar(0, position)
|
self:call_calendar(0, position)
|
||||||
self.visible = true
|
self.visible = true
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
widget:connect_signal("mouse::leave", function ()
|
widget:connect_signal("mouse::leave", function ()
|
||||||
if not self._calendar_clicked then
|
if not self._calendar_clicked_on then
|
||||||
self.visible = false
|
self.visible = false
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
@ -334,11 +334,11 @@ local function get_cal_wibox(caltype, args)
|
||||||
ret:buttons(gears.table.join(
|
ret:buttons(gears.table.join(
|
||||||
abutton({ }, 1, function ()
|
abutton({ }, 1, function ()
|
||||||
ret.visible=false
|
ret.visible=false
|
||||||
ret._calendar_clicked=false
|
ret._calendar_clicked_on=false
|
||||||
end),
|
end),
|
||||||
abutton({ }, 3, function ()
|
abutton({ }, 3, function ()
|
||||||
ret.visible=false
|
ret.visible=false
|
||||||
ret._calendar_clicked=false
|
ret._calendar_clicked_on=false
|
||||||
end),
|
end),
|
||||||
abutton({ }, 4, function () ret:call_calendar(-1) end),
|
abutton({ }, 4, function () ret:call_calendar(-1) end),
|
||||||
abutton({ }, 5, function () ret:call_calendar( 1) end)
|
abutton({ }, 5, function () ret:call_calendar( 1) end)
|
||||||
|
|
Loading…
Reference in New Issue