Skip to content

Return to the base layout when closing a numpad/D-pad overlay #2693

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

Open
MiMoHo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Return to the base layout when closing a numpad/D-pad overlay #2693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ class KeyboardState(private val switchActions: SwitchActions) {
}
if (mode == layout.mode()) {
loadPreviousLayout(autoCapsFlags, recapitalizeMode)
} else if (!isInLayoutSlide && (mode == Mode.NUMPAD || mode == Mode.DPAD) && (layout == Utility.NUMPAD || layout == Utility.DPAD)) {
// numpad and dpad are sibling overlays: switching directly from one to the other must not
// push onto the previous-layout stack, otherwise closing the new overlay would fall back to
// the other overlay instead of the layout they were both opened over (usually the alphabet).
// only for a deliberate (non-sliding) switch: while sliding, the tail below pops the pushed
// entry, so we must take the regular setLayout path to keep that accounting balanced.
loadLayout(layout)
} else {
setLayout(layout)
}
Expand Down