From 457996a118c9659a6b5db55c1468f4ae3bf82db5 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Wed, 23 Feb 2022 20:33:04 +0800 Subject: [PATCH] Voltaire // New PgDn/Up functions with single page. - When candidates take only one page, PgDn/PgUp functions like arrow keys. --- Source/UI/CandidateUI/HorizontalCandidateController.swift | 8 ++++++++ Source/UI/CandidateUI/VerticalCandidateController.swift | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/Source/UI/CandidateUI/HorizontalCandidateController.swift b/Source/UI/CandidateUI/HorizontalCandidateController.swift index a6494bb7..35e8e6e8 100644 --- a/Source/UI/CandidateUI/HorizontalCandidateController.swift +++ b/Source/UI/CandidateUI/HorizontalCandidateController.swift @@ -259,6 +259,10 @@ public class HorizontalCandidateController: CandidateController { return false } + if pageCount == 1 { + return highlightNextCandidate() + } + if currentPage + 1 >= pageCount { currentPage = 0 } else { @@ -275,6 +279,10 @@ public class HorizontalCandidateController: CandidateController { return false } + if pageCount == 1 { + return highlightPreviousCandidate() + } + if currentPage == 0 { currentPage = pageCount - 1 } else { diff --git a/Source/UI/CandidateUI/VerticalCandidateController.swift b/Source/UI/CandidateUI/VerticalCandidateController.swift index 05a9b4dd..4cae2144 100644 --- a/Source/UI/CandidateUI/VerticalCandidateController.swift +++ b/Source/UI/CandidateUI/VerticalCandidateController.swift @@ -265,6 +265,10 @@ public class VerticalCandidateController: CandidateController { return false } + if pageCount == 1 { + return highlightNextCandidate() + } + if currentPage + 1 >= pageCount { currentPage = 0 } else { @@ -281,6 +285,10 @@ public class VerticalCandidateController: CandidateController { return false } + if pageCount == 1 { + return highlightPreviousCandidate() + } + if currentPage == 0 { currentPage = pageCount - 1 } else {