From e024e51c618131bf1b72e6864654416354dcbd6b Mon Sep 17 00:00:00 2001 From: Cadin Batrack Date: Fri, 3 Nov 2023 10:29:01 -0700 Subject: [PATCH 1/4] properly set default advanceControl --- Panels.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Panels.lua b/Panels.lua index 9d0fa83..49743a7 100644 --- a/Panels.lua +++ b/Panels.lua @@ -506,7 +506,9 @@ local function loadSequence(num) if sequence.advanceControls == nil then local control if sequence.advanceControl == nil then - control = {input = getAdvanceControlForScrollDirection(sequence.direction)} + local _input = getAdvanceControlForScrollDirection(sequence.direction) + control = {input = _input} + sequence.advanceControl = _input else control = {input = sequence.advanceControl} end @@ -521,6 +523,7 @@ local function loadSequence(num) end sequence.advanceControls = { control } + end if sequence.showAdvanceControls == nil then From 574908e16abdc3648b900a0a4e01adf616003371 Mon Sep 17 00:00:00 2001 From: Cadin Batrack Date: Fri, 3 Nov 2023 10:35:14 -0700 Subject: [PATCH 2/4] reset buttonsPressed when scrolling oversize panel --- Panels.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Panels.lua b/Panels.lua index 49743a7..1b80034 100644 --- a/Panels.lua +++ b/Panels.lua @@ -322,6 +322,7 @@ end local function scrollToNextPanel() if not isLastPanel(panelNum) then local p = panels[panelNum] + p.buttonsPressed = {} local target = 0 if p.frame.height > ScreenHeight and scrollPos > p.frame.y * -1 then target = getPanelScrollLocation(p, true) From 39d864cd8a42d1e00709b4ffb28d81ad6364183a Mon Sep 17 00:00:00 2001 From: Cadin Batrack Date: Fri, 3 Nov 2023 12:10:00 -0700 Subject: [PATCH 3/4] fix advanceFunction for oversize panels --- Panels.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Panels.lua b/Panels.lua index 1b80034..b8cc0e4 100644 --- a/Panels.lua +++ b/Panels.lua @@ -321,6 +321,7 @@ end local function scrollToNextPanel() if not isLastPanel(panelNum) then + if panelTransitionAnimator and panelTransitionAnimator:progress() < 1 then return end local p = panels[panelNum] p.buttonsPressed = {} local target = 0 @@ -793,13 +794,14 @@ local function updateComic(offset) else finishSequence() end - else - updateScroll() - if sequence.scrollType == Panels.ScrollType.MANUAL then - updateArrowControls() - end - checkInputs() end + + updateScroll() + if sequence.scrollType == Panels.ScrollType.MANUAL then + updateArrowControls() + end + checkInputs() + end end From 3c2676e2a22fb6b93f7d6277a81c896a8d982fe3 Mon Sep 17 00:00:00 2001 From: Cadin Batrack Date: Fri, 3 Nov 2023 13:55:31 -0700 Subject: [PATCH 4/4] update version --- Panels.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Panels.lua b/Panels.lua index b8cc0e4..8a1dd56 100644 --- a/Panels.lua +++ b/Panels.lua @@ -1,4 +1,4 @@ --- Panels version 1.6.1 +-- Panels version 1.6.2 -- https://cadin.github.io/panels/ import "CoreLibs/object"