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

Add special 'mac-' and 'win-' modifiers, fixes #29

Browse Source
This commit is contained in:
airstruck
2016-01-28 11:26:04 -05:00
parent f9a8ffa2e2
commit d1501fca41
5 changed files with 72 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
luigi/attribute.lua
View File

@@ -13,6 +13,8 @@ to recalculate their size and position.
local ROOT = (...):gsub('[^.]*$', '')
local Shortcut = require(ROOT .. 'shortcut')
local Attribute = {}
local function cascade (widget, attribute)
@@ -223,15 +225,11 @@ Setting this attribute re-registers the widget with its layout.
--]]--
Attribute.shortcut = {}
-- TODO: formalize this bitfield somewhere
local function parseKeyCombo (value)
local mainKey = (value):match '[^%-]+$'
local alt = (value):match 'alt%-' and 1 or 0
local ctrl = (value):match 'ctrl%-' and 2 or 0
local shift = (value):match 'shift%-' and 4 or 0
local modifierFlags = alt + ctrl + shift
return mainKey, modifierFlags
local function setShortcut (layout, shortcut, value)
local mainKey, modifierFlags = Shortcut.parseKeyCombo(shortcut)
if mainKey then
layout.shortcuts[modifierFlags][mainKey] = value
end
end
function Attribute.shortcut.set (widget, value)
@@ -241,24 +239,20 @@ function Attribute.shortcut.set (widget, value)
if oldValue then
if type(oldValue) == 'table' then
for _, v in ipairs(oldValue) do
local mainKey, modifierFlags = parseKeyCombo(v)
layout.shortcuts[modifierFlags][mainKey] = nil
setShortcut(layout, v, nil)
end
else
local mainKey, modifierFlags = parseKeyCombo(oldValue)
layout.shortcuts[modifierFlags][mainKey] = nil
setShortcut(layout, oldValue, nil)
end
end
if value then
if type(value) == 'table' then
for _, v in ipairs(value) do
local mainKey, modifierFlags = parseKeyCombo(v)
layout.shortcuts[modifierFlags][mainKey] = widget
setShortcut(layout, v, widget)
end
else
local mainKey, modifierFlags = parseKeyCombo(value)
layout.shortcuts[modifierFlags][mainKey] = widget
setShortcut(layout, value, widget)
end
end