From 806c0ab4947a506d4bdaaefbfe14a026bd30439a Mon Sep 17 00:00:00 2001 From: Igor Hatarist Date: Wed, 27 Apr 2016 23:34:59 +0300 Subject: [PATCH] Create a setting to make stickers look smaller in the chat window (200px -> 40px) --- TelegramTest/MessageTableItemSticker.m | 27 ++++++++++++++++++---- TelegramTest/SettingsArchiver.h | 3 ++- TelegramTest/en.lproj/Localizable.strings | Bin 116574 -> 116682 bytes 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/TelegramTest/MessageTableItemSticker.m b/TelegramTest/MessageTableItemSticker.m index 4332e363..4e0105a2 100644 --- a/TelegramTest/MessageTableItemSticker.m +++ b/TelegramTest/MessageTableItemSticker.m @@ -16,7 +16,11 @@ -(id)initWithObject:(TL_localMessage *)object { if(NSSizeNotZero(self.document.imageSize)) { self.blockSize = self.document.imageSize; } else { - self.blockSize = NSMakeSize(200, 200); + if ([SettingsArchiver checkMaskedSetting:SmallerStickers]) { + self.blockSize = NSMakeSize(40, 40); + } else { + self.blockSize = NSMakeSize(200, 200); + } } NSImage *placeholder; @@ -36,8 +40,12 @@ -(id)initWithObject:(TL_localMessage *)object { if(!placeholder) placeholder = white_background_color(); - self.blockSize = strongsize(self.blockSize, 200); - + if ([SettingsArchiver checkMaskedSetting:SmallerStickers]) { + self.blockSize = strongsize(self.blockSize, 40); + } else { + self.blockSize = strongsize(self.blockSize, 200); + } + self.imageObject = [[TGStickerImageObject alloc] initWithDocument:self.document placeholder:placeholder]; self.imageObject.imageSize = self.blockSize; @@ -52,10 +60,19 @@ -(BOOL)makeSizeByWidth:(int)width { if(NSSizeNotZero(self.document.imageSize)) { self.blockSize = self.document.imageSize; } else { - self.blockSize = NSMakeSize(200, 200); + if ([SettingsArchiver checkMaskedSetting:SmallerStickers]) { + self.blockSize = NSMakeSize(40, 40); + } else { + self.blockSize = NSMakeSize(200, 200); + } } - self.contentSize = self.blockSize = strongsize(self.blockSize, MIN(width,200)); + if ([SettingsArchiver checkMaskedSetting:SmallerStickers]) { + self.contentSize = self.blockSize = strongsize(self.blockSize, MIN(width, 40)); + } else { + self.contentSize = self.blockSize = strongsize(self.blockSize, MIN(width, 200)); + } + return [super makeSizeByWidth:width]; } diff --git a/TelegramTest/SettingsArchiver.h b/TelegramTest/SettingsArchiver.h index a144d5c5..886a1b00 100644 --- a/TelegramTest/SettingsArchiver.h +++ b/TelegramTest/SettingsArchiver.h @@ -42,7 +42,8 @@ typedef enum { IncludeMutedUnreadCount = 1 << 25, DisableAutoplayGifSetting = 1 << 26, TripleLayoutSettings = 1 << 27, - HandleMediaKeysSettings = 2 << 28 + HandleMediaKeysSettings = 2 << 28, + SmallerStickers = 2 << 29, } SettingsMask; diff --git a/TelegramTest/en.lproj/Localizable.strings b/TelegramTest/en.lproj/Localizable.strings index 8968397ddc7a16181b3c809ed5e0405a2fd56026..4393f229d7da12e7a75b759d9e43ea0377b491f9 100644 GIT binary patch delta 72 zcmccD$9}4xy$6E?ICiETq^+>4irNG delta 22 ecmX@r&wj6uy