Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add keystroke event support and allow adding text lines to the line editor #1040

Merged
merged 6 commits into from
Mar 26, 2024
Merged

Add keystroke event support and allow adding text lines to the line editor #1040

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41e14d3
Add keystroke event support and allow adding text lines to the line e…
maxim-productengine Mar 25, 2024
7f39a5b
mac build fix
maxim-productengine Mar 25, 2024
6d3226e
Merge branch 'release/luau-scripting' into lua-keystroke
maxim-productengine Mar 25, 2024
6cedaec
Update test scripts to call leap.request() from main thread
maxim-productengine Mar 25, 2024
24a7842
update scripts to use fiber.launch()
maxim-productengine Mar 26, 2024
7a22e15
Merge branch 'release/luau-scripting' into luau-keystroke
maxim-productengine Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion indra/newview/scripts/lua/test_luafloater_demo.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ XML_FILE_PATH = "luafloater_demo.xml"

leap = require 'leap'
coro = require 'coro'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this point you could ditch require 'coro' too.

fiber = require 'fiber'

--event pump for sending actions to the floater
COMMAND_PUMP_NAME = ""
Expand Down Expand Up @@ -63,4 +64,4 @@ function process_events(waitfor)
end
end

coro.launch(process_events, catch_events)
fiber.launch("catch_events", process_events, catch_events)
3 changes: 2 additions & 1 deletion indra/newview/scripts/lua/test_luafloater_gesture_list.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ XML_FILE_PATH = "luafloater_gesture_list.xml"

leap = require 'leap'
coro = require 'coro'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

require 'coro' no longer needed.

fiber = require 'fiber'
LLGesture = require 'LLGesture'

--event pump for sending actions to the floater
Expand Down Expand Up @@ -60,4 +61,4 @@ function process_events(waitfor)
end
end

coro.launch(process_events, catch_events)
fiber.launch("catch_events", process_events, catch_events)
Loading