Skip to content

Move event handler for EVT_VIRTUAL_ENTER_LONG #314

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

Merged
merged 1 commit into from
Feb 19, 2020
Merged

Move event handler for EVT_VIRTUAL_ENTER_LONG #314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/SCRIPTS/BF/ui.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,6 @@ local function run_ui(event)
invalidatePages()
end
end
end
if event == EVT_VIRTUAL_ENTER_LONG then
popupMenuActive = 1
killEnterBreak = 1
pageState = pageStatus.popupMenu
elseif pageState == pageStatus.popupMenu then
if event == EVT_VIRTUAL_EXIT then
pageState = pageStatus.display
Expand All @@ -323,7 +318,7 @@ local function run_ui(event)
popupMenuList[popupMenuActive].f()
end
end
elseif pageState <= pageStatus.display then
elseif pageState == pageStatus.display then
if event == EVT_VIRTUAL_PREV_PAGE then
incPage(-1)
killEvents(event) -- X10/T16 issue: pageUp is a long press
Expand All @@ -340,6 +335,10 @@ local function run_ui(event)
pageState = pageStatus.editing
end
end
elseif event == EVT_VIRTUAL_ENTER_LONG then
popupMenuActive = 1
killEnterBreak = 1
pageState = pageStatus.popupMenu
elseif event == EVT_VIRTUAL_EXIT then
invalidatePages()
currentField = 1
Expand Down