mirrors/love-luigi
1
0
Fork 0
mirror of https://github.com/airstruck/luigi.git synced 2026-01-09 15:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

text widget: separate mac/non-mac keyboard support

Browse Source
This commit is contained in:
airstruck
2016-01-27 15:13:03 -05:00
parent e6c649ba49
commit 346cbac946
1 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
luigi/widget/text.lua
View File

@@ -228,7 +228,7 @@ local function isShiftPressed ()
return Backend.isKeyDown('lshift', 'rshift') return Backend.isKeyDown('lshift', 'rshift')
end end
-- "command" means the command key on Mac and the ctrl key everywhere else. -- check command (gui) key, only on Mac.
local isCommandPressed local isCommandPressed
if Backend.isMac() then if Backend.isMac() then
isCommandPressed = function () isCommandPressed = function ()
@@ -236,6 +236,30 @@ if Backend.isMac() then
end end
else else
isCommandPressed = function () isCommandPressed = function ()
return false
end
end
-- check command (gui) key on Mac and ctrl key everywhere else.
local isCommandOrCtrlPressed
if Backend.isMac() then
isCommandOrCtrlPressed = function ()
return Backend.isKeyDown('lgui', 'rgui')
end
else
isCommandOrCtrlPressed = function ()
return Backend.isKeyDown('lctrl', 'rctrl')
end
end
-- check option (alt) key on Mac and ctrl key everywhere else.
local isOptionOrCtrlPressed
if Backend.isMac() then
isOptionOrCtrlPressed = function ()
return Backend.isKeyDown('lalt', 'ralt')
end
else
isOptionOrCtrlPressed = function ()
return Backend.isKeyDown('lctrl', 'rctrl') return Backend.isKeyDown('lctrl', 'rctrl')
end end
end end
@@ -315,9 +339,9 @@ This color is used to indicate the selected range of text.
elseif event.key == 'left' then elseif event.key == 'left' then
if Backend.isKeyDown('lctrl', 'rctrl') then if isOptionOrCtrlPressed() then
moveWordLeft(self, isShiftPressed()) moveWordLeft(self, isShiftPressed())
elseif Backend.isKeyDown('lgui', 'rgui') then elseif isCommandPressed() then
moveLineLeft(self, isShiftPressed()) moveLineLeft(self, isShiftPressed())
else else
moveCharLeft(self, isShiftPressed()) moveCharLeft(self, isShiftPressed())
@@ -325,9 +349,9 @@ This color is used to indicate the selected range of text.
elseif event.key == 'right' then elseif event.key == 'right' then
if Backend.isKeyDown('lctrl', 'rctrl') then if isOptionOrCtrlPressed() then
moveWordRight(self, isShiftPressed()) moveWordRight(self, isShiftPressed())
elseif Backend.isKeyDown('lgui', 'rgui') then elseif isCommandPressed() then
moveLineRight(self, isShiftPressed()) moveLineRight(self, isShiftPressed())
else else
moveCharRight(self, isShiftPressed()) moveCharRight(self, isShiftPressed())
@@ -341,20 +365,20 @@ This color is used to indicate the selected range of text.
moveLineRight(self, isShiftPressed()) moveLineRight(self, isShiftPressed())
elseif event.key == 'x' and isCommandPressed() then elseif event.key == 'x' and isCommandOrCtrlPressed() then
copyRangeToClipboard(self) copyRangeToClipboard(self)
deleteRange(self) deleteRange(self)
elseif event.key == 'c' and isCommandPressed() then elseif event.key == 'c' and isCommandOrCtrlPressed() then
copyRangeToClipboard(self) copyRangeToClipboard(self)
elseif event.key == 'v' and isCommandPressed() then elseif event.key == 'v' and isCommandOrCtrlPressed() then
pasteFromClipboard(self) pasteFromClipboard(self)
elseif event.key == 'a' and isCommandPressed() then elseif event.key == 'a' and isCommandOrCtrlPressed() then
selectRange(self, 0, #self.value) selectRange(self, 0, #self.value)