Improved bottom bar scrolling

Vince14Genius · May 12, 2020 · 93418d8 · 93418d8
1 parent c24c634
commit 93418d8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/IPA Keyboard Extension/KeyboardViewController.swift b/IPA Keyboard Extension/KeyboardViewController.swift
@@ -118,9 +118,21 @@ class KeyboardViewController: MasterKeyboardViewController, UICollectionViewData
         UISelectionFeedbackGenerator().selectionChanged()
         guard let buttonTitle = button.currentTitle else { fatalError("Wrong button.") }
         for i in 0..<IPASymbols.sectionGlyphs.count {
-            let middleIndex = (getKeySet(section: i)?.count ?? 0) / 2
             if buttonTitle == IPASymbols.sectionGlyphs[i] {
-                self.keyCollection.scrollToItem(at: [i, middleIndex], at: .centeredHorizontally, animated: true)
+                // Calculate middle index
+                let middleIndex = (getKeySet(section: i)?.count ?? 0) / 2
+
+                // Calculate columns on screen
+                let visibleItemsCount = self.keyCollection.indexPathsForVisibleItems.count
+
+                if middleIndex > visibleItemsCount / 2 + cellsPerColumn {
+                    // big section
+                    self.keyCollection.scrollToItem(at: [i, visibleItemsCount / 2 - cellsPerColumn], at: .centeredHorizontally, animated: true)
+                } else {
+                    // small section
+                    self.keyCollection.scrollToItem(at: [i, middleIndex], at: .centeredHorizontally, animated: true)
+                }
+
                 return
             }
         }

diff --git a/...j/project.xcworkspace/xcuserdata/vince14genius.xcuserdatad/UserInterfaceState.xcuserstate b/...j/project.xcworkspace/xcuserdata/vince14genius.xcuserdatad/UserInterfaceState.xcuserstate