procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

new channel blank photos, 0.8.58.dev version

This commit is contained in:
John Preston 2015-09-22 13:26:39 +03:00
parent b3cb6fc317
commit 7a74c5a311
8 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Telegram/SourceFiles/art/channelcolor1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
Telegram/SourceFiles/art/channelcolor2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
Telegram/SourceFiles/art/channelcolor3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
Telegram/SourceFiles/art/channelcolor4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

2
Telegram/SourceFiles/localstorage.cpp
View File

@ -2946,7 +2946,7 @@ namespace Local {
channel->input = MTP_inputPeerChannel(MTP_int(peerToChannel(channel->id)), MTP_long(access)); channel->input = MTP_inputPeerChannel(MTP_int(peerToChannel(channel->id)), MTP_long(access));
channel->inputChannel = MTP_inputChannel(MTP_int(peerToChannel(channel->id)), MTP_long(access)); channel->inputChannel = MTP_inputChannel(MTP_int(peerToChannel(channel->id)), MTP_long(access));
channel->photo = photoLoc.isNull() ? ImagePtr(chatDefPhoto(channel->colorIndex)) : ImagePtr(photoLoc); channel->photo = photoLoc.isNull() ? ImagePtr(channelDefPhoto(channel->colorIndex)) : ImagePtr(photoLoc);
} }
App::markPeerUpdated(result); App::markPeerUpdated(result);
emit App::main()->peerPhotoChanged(result); emit App::main()->peerPhotoChanged(result);

18
Telegram/SourceFiles/structs.cpp
View File

@ -82,6 +82,16 @@ ImagePtr chatDefPhoto(int32 index) {
return chatDefPhotos[index]; return chatDefPhotos[index];
} }
ImagePtr channelDefPhoto(int32 index) {
static const ImagePtr channelDefPhotos[4] = {
ImagePtr(qsl(":/ava/art/channelcolor1.png"), "PNG"),
ImagePtr(qsl(":/ava/art/channelcolor2.png"), "PNG"),
ImagePtr(qsl(":/ava/art/channelcolor3.png"), "PNG"),
ImagePtr(qsl(":/ava/art/channelcolor4.png"), "PNG"),
};
return channelDefPhotos[index];
}
NotifySettings globalNotifyAll, globalNotifyUsers, globalNotifyChats; NotifySettings globalNotifyAll, globalNotifyUsers, globalNotifyChats;
NotifySettingsPtr globalNotifyAllPtr = UnknownNotifySettings, globalNotifyUsersPtr = UnknownNotifySettings, globalNotifyChatsPtr = UnknownNotifySettings; NotifySettingsPtr globalNotifyAllPtr = UnknownNotifySettings, globalNotifyUsersPtr = UnknownNotifySettings, globalNotifyChatsPtr = UnknownNotifySettings;
@ -89,7 +99,7 @@ PeerData::PeerData(const PeerId &id) : id(id), lnk(new PeerLink(this))
, loaded(false) , loaded(false)
, colorIndex(peerColorIndex(id)) , colorIndex(peerColorIndex(id))
, color(peerColor(colorIndex)) , color(peerColor(colorIndex))
, photo((isChat() || isChannel()) ? chatDefPhoto(colorIndex) : userDefPhoto(colorIndex)) , photo(isChat() ? chatDefPhoto(colorIndex) : (isChannel() ? channelDefPhoto(colorIndex) : userDefPhoto(colorIndex)))
, photoId(UnknownPeerPhotoId) , photoId(UnknownPeerPhotoId)
, nameVersion(0) , nameVersion(0)
, notify(UnknownNotifySettings) , notify(UnknownNotifySettings)
@ -351,13 +361,13 @@ void ChannelData::setPhoto(const MTPChatPhoto &p, const PhotoId &phId) { // see
newPhotoId = phId; newPhotoId = phId;
} }
newPhotoLoc = App::imageLocation(160, 160, d.vphoto_small); newPhotoLoc = App::imageLocation(160, 160, d.vphoto_small);
newPhoto = newPhotoLoc.isNull() ? chatDefPhoto(colorIndex) : ImagePtr(newPhotoLoc); newPhoto = newPhotoLoc.isNull() ? channelDefPhoto(colorIndex) : ImagePtr(newPhotoLoc);
// photoFull = ImagePtr(640, 640, d.vphoto_big, chatDefPhoto(colorIndex)); // photoFull = ImagePtr(640, 640, d.vphoto_big, channelDefPhoto(colorIndex));
} break; } break;
default: { default: {
newPhotoId = 0; newPhotoId = 0;
newPhotoLoc = StorageImageLocation(); newPhotoLoc = StorageImageLocation();
newPhoto = chatDefPhoto(colorIndex); newPhoto = channelDefPhoto(colorIndex);
// photoFull = ImagePtr(); // photoFull = ImagePtr();
} break; } break;
} }

1
Telegram/SourceFiles/structs.h
View File

@ -173,6 +173,7 @@ inline bool isNotifyMuted(NotifySettingsPtr settings, int32 *changeIn = 0) {
style::color peerColor(int32 index); style::color peerColor(int32 index);
ImagePtr userDefPhoto(int32 index); ImagePtr userDefPhoto(int32 index);
ImagePtr chatDefPhoto(int32 index); ImagePtr chatDefPhoto(int32 index);
ImagePtr channelDefPhoto(int32 index);
static const PhotoId UnknownPeerPhotoId = 0xFFFFFFFFFFFFFFFFULL; static const PhotoId UnknownPeerPhotoId = 0xFFFFFFFFFFFFFFFFULL;

4
Telegram/SourceFiles/telegram.qrc
View File

@ -19,6 +19,10 @@
<file>art/chatcolor2.png</file> <file>art/chatcolor2.png</file>
<file>art/chatcolor3.png</file> <file>art/chatcolor3.png</file>
<file>art/chatcolor4.png</file> <file>art/chatcolor4.png</file>
<file>art/channelcolor1.png</file>
<file>art/channelcolor2.png</file>
<file>art/channelcolor3.png</file>
<file>art/channelcolor4.png</file>
<file>art/usercolor1.png</file> <file>art/usercolor1.png</file>
<file>art/usercolor2.png</file> <file>art/usercolor2.png</file>
<file>art/usercolor3.png</file> <file>art/usercolor3.png</file>