mirrors/love-luigi
1
0
Fork 0
mirror of https://github.com/airstruck/luigi.git synced 2025-12-19 02:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

attrib "key" -> "shortcut", also fix #20

Browse Source
This commit is contained in:
airstruck
2016-01-03 01:18:04 -05:00
parent 3abcce1615
commit c73833337e
12 changed files with 98 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
luigi/layout.lua
View File

@@ -60,6 +60,25 @@ function Layout:constructor (data, master)
self.isReady = true
end
--[[--
Create a detached widget.
Internal function used to create widgets that are associated with
a layout, but "detached" from it.
Used by context menus, which use their "owner" widget's layout
for theme and style information but appear in a separate layout.
@tparam table data
A tree of widget data.
@treturn Widget
A widget instance.
--]]--
function Layout:createWidget (data)
return Widget(self, data)
end
local function clearWidget (widget)
widget.textData = nil
widget.fontData = nil
@@ -97,10 +116,6 @@ Master layout
function Layout:setMaster (layout)
self.master = layout
function self:addWidget (...)
return layout:addWidget(...)
end
reset(self)
return self
end
@@ -259,12 +274,12 @@ function Layout:getWidgetAt (x, y, root)
if root:isAt(x, y) then return root end
end
-- Add handlers for keyboard accelerators, tab focus, and mouse wheel scroll
-- Add handlers for keyboard shortcuts, tab focus, and mouse wheel scroll
function Layout:addDefaultHandlers ()
self.accelerators = {}
self.shortcuts = {}
for i = 0, 8 do
self.accelerators[i] = {}
self.shortcuts[i] = {}
end
self:onPressStart(function (event)
@@ -299,8 +314,8 @@ function Layout:addDefaultHandlers ()
self:onKeyPress(function (event)
-- keyboard accelerators
local entry = self.accelerators[event.modifierFlags]
-- keyboard shortcuts
local entry = self.shortcuts[event.modifierFlags]
local acceleratedWidget = entry and entry[event.key]
if acceleratedWidget then
acceleratedWidget.hovered = true
@@ -331,8 +346,8 @@ function Layout:addDefaultHandlers ()
self:onKeyRelease(function (event)
-- accelerators
local entry = self.accelerators[event.modifierFlags]
-- shortcuts
local entry = self.shortcuts[event.modifierFlags]
local acceleratedWidget = entry and entry[event.key]
if acceleratedWidget then