TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix >xxhdpi screens misrendering emoji

Browse Source 
Fixes #2957
Closes #3302
// FREEBIE
This commit is contained in:
Jake McGinty 2015-06-01 14:50:06 -07:00 committed by Moxie Marlinspike
parent fa2f9686ce
commit 21341c5213
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
View File

@ -73,9 +73,10 @@ public class EmojiProvider {
int[] pages = ResUtil.getResourceIds(context, R.array.emoji_categories); int[] pages = ResUtil.getResourceIds(context, R.array.emoji_categories);
this.context = context.getApplicationContext(); this.context = context.getApplicationContext();
this.drawHeight = context.getResources().getDimension(R.dimen.emoji_drawer_size); this.drawHeight = Math.min(context.getResources().getDimension(R.dimen.emoji_drawer_size), EMOJI_RAW_HEIGHT);
this.drawWidth = drawHeight * ((double)EMOJI_RAW_WIDTH) / EMOJI_RAW_HEIGHT; double drawScale = drawHeight / EMOJI_RAW_HEIGHT;
this.verticalPad = EMOJI_VERT_PAD * drawHeight / EMOJI_RAW_HEIGHT; this.drawWidth = EMOJI_RAW_WIDTH * drawScale;
this.verticalPad = EMOJI_VERT_PAD * drawScale;
Log.w(TAG, "draw size: " + drawWidth + "x" + drawHeight); Log.w(TAG, "draw size: " + drawWidth + "x" + drawHeight);
for (int i = 0; i < pages.length; i++) { for (int i = 0; i < pages.length; i++) {
final EmojiPageBitmap page = new EmojiPageBitmap(i); final EmojiPageBitmap page = new EmojiPageBitmap(i);