android-apps-mirrors/HeliBoard
0
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-28 11:49:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore spacer columns when calculating emoji page size (#1721)

Browse source
This commit is contained in:
Eran Leshem 2025-06-22 13:18:37 +03:00 • committed by GitHub
parent 76ebf99921
commit 9193c95c2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/helium314/keyboard/keyboard/emoji/DynamicGridKeyboard.java
View file

@ -112,12 +112,12 @@ final class DynamicGridKeyboard extends Keyboard {
}
public int getDynamicOccupiedHeight() {
final int row = (mGridKeys.size() - 1) / mColumnsNum + 1;
final int row = (mGridKeys.size() - 1) / getOccupiedColumnCount() + 1;
return row * mVerticalStep;
}
public int getColumnsCount() {
return mColumnsNum;
public int getOccupiedColumnCount() {
return mColumnsNum - mEmptyColumnIndices.size();
}
public void addPendingKey(final Key usedKey) {

2
app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiCategory.java
View file

@ -324,7 +324,7 @@ final class EmojiCategory {
final DynamicGridKeyboard tempKeyboard = new DynamicGridKeyboard(mPrefs,
mLayoutSet.getKeyboard(KeyboardId.ELEMENT_EMOJI_RECENTS),
0, 0, ResourceUtils.getKeyboardWidth(mContext, Settings.getValues()));
return MAX_LINE_COUNT_PER_PAGE * tempKeyboard.getColumnsCount();
return MAX_LINE_COUNT_PER_PAGE * tempKeyboard.getOccupiedColumnCount();
}
private static final Comparator<Key> EMOJI_KEY_COMPARATOR = (lhs, rhs) -> {