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

no lag in changing normal to wide adaptive mode, files overview ext display improved, no inline bot progress while resolving username, version 0.9.20.dev

This commit is contained in:
John Preston 2016-02-08 19:04:44 +03:00
parent 80ba0259dd
commit d6f549fef6
5 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/Resources/style.txt
View File

@ -1285,9 +1285,6 @@ msgFileBlue: sprite(60px, 425px, 20px, 20px);
msgFileOverDuration: 200; msgFileOverDuration: 200;
msgFileRadialLine: 3px; msgFileRadialLine: 3px;
msgFileExtPadding: 8px;
msgFileExtTop: 30px;
msgVideoSize: size(320px, 240px); msgVideoSize: size(320px, 240px);
sendPadding: 9px; sendPadding: 9px;
@ -2200,6 +2197,9 @@ overviewFileStatusTop: 27px;
overviewFileDateTop: 49px; overviewFileDateTop: 49px;
overviewFileChecked: #2fa9e2; overviewFileChecked: #2fa9e2;
overviewFileCheck: #00000066; overviewFileCheck: #00000066;
overviewFileExtPadding: 5px;
overviewFileExtTop: 24px;
overviewFileExtFont: font(18px semibold);
// Mac specific // Mac specific

13
Telegram/SourceFiles/history.cpp
View File

@ -2927,6 +2927,10 @@ bool HistoryItem::displayFromPhoto() const {
return Adaptive::Wide() || (!out() && !history()->peer->isUser() && !fromChannel()); return Adaptive::Wide() || (!out() && !history()->peer->isUser() && !fromChannel());
} }
bool HistoryItem::shiftFromPhoto() const {
return Adaptive::Wide() && !out() && !history()->peer->isUser() && !fromChannel();
}
void HistoryItem::clipCallback(ClipReaderNotification notification) { void HistoryItem::clipCallback(ClipReaderNotification notification) {
HistoryMedia *media = getMedia(); HistoryMedia *media = getMedia();
if (!media) return; if (!media) return;
@ -6225,7 +6229,14 @@ void HistoryMessage::countPositionAndSize(int32 &left, int32 &width) const {
} }
left += (!fromChannel() && out()) ? st::msgMargin.right() : st::msgMargin.left(); left += (!fromChannel() && out()) ? st::msgMargin.right() : st::msgMargin.left();
if (displayFromPhoto()) { if (displayFromPhoto()) {
left += (!fromChannel() && out()) ? -st::msgPhotoSkip : st::msgPhotoSkip; if (!fromChannel() && out()) {
left -= st::msgPhotoSkip;
} else {
left += st::msgPhotoSkip;
if (shiftFromPhoto()) {
left += st::msgPhotoSkip;
}
}
} }
width = hwidth - st::msgMargin.left() - st::msgMargin.right(); width = hwidth - st::msgMargin.left() - st::msgMargin.right();

1
Telegram/SourceFiles/history.h
View File

@ -1021,6 +1021,7 @@ public:
return (!out() || fromChannel()) && !history()->peer->isUser(); return (!out() || fromChannel()) && !history()->peer->isUser();
} }
bool displayFromPhoto() const; bool displayFromPhoto() const;
bool shiftFromPhoto() const;
void clipCallback(ClipReaderNotification notification); void clipCallback(ClipReaderNotification notification);

8
Telegram/SourceFiles/historywidget.cpp
View File

@ -2838,12 +2838,12 @@ void HistoryWidget::updateInlineBotQuery() {
QString query = _field.getInlineBotQuery(_inlineBot, _inlineBotUsername); QString query = _field.getInlineBotQuery(_inlineBot, _inlineBotUsername);
if (inlineBotUsername != _inlineBotUsername) { if (inlineBotUsername != _inlineBotUsername) {
if (_inlineBotResolveRequestId) { if (_inlineBotResolveRequestId) {
Notify::inlineBotRequesting(false); // Notify::inlineBotRequesting(false);
MTP::cancel(_inlineBotResolveRequestId); MTP::cancel(_inlineBotResolveRequestId);
_inlineBotResolveRequestId = 0; _inlineBotResolveRequestId = 0;
} }
if (_inlineBot == InlineBotLookingUpData) { if (_inlineBot == InlineBotLookingUpData) {
Notify::inlineBotRequesting(true); // Notify::inlineBotRequesting(true);
_inlineBotResolveRequestId = MTP::send(MTPcontacts_ResolveUsername(MTP_string(_inlineBotUsername)), rpcDone(&HistoryWidget::inlineBotResolveDone), rpcFail(&HistoryWidget::inlineBotResolveFail, _inlineBotUsername)); _inlineBotResolveRequestId = MTP::send(MTPcontacts_ResolveUsername(MTP_string(_inlineBotUsername)), rpcDone(&HistoryWidget::inlineBotResolveDone), rpcFail(&HistoryWidget::inlineBotResolveFail, _inlineBotUsername));
return; return;
} }
@ -5066,7 +5066,7 @@ bool HistoryWidget::hasBroadcastToggle() const {
void HistoryWidget::inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result) { void HistoryWidget::inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result) {
_inlineBotResolveRequestId = 0; _inlineBotResolveRequestId = 0;
Notify::inlineBotRequesting(false); // Notify::inlineBotRequesting(false);
_inlineBotUsername = QString(); _inlineBotUsername = QString();
if (result.type() == mtpc_contacts_resolvedPeer) { if (result.type() == mtpc_contacts_resolvedPeer) {
const MTPDcontacts_resolvedPeer &d(result.c_contacts_resolvedPeer()); const MTPDcontacts_resolvedPeer &d(result.c_contacts_resolvedPeer());
@ -5080,7 +5080,7 @@ bool HistoryWidget::inlineBotResolveFail(QString name, const RPCError &error) {
if (mtpIsFlood(error)) return false; if (mtpIsFlood(error)) return false;
_inlineBotResolveRequestId = 0; _inlineBotResolveRequestId = 0;
Notify::inlineBotRequesting(false); // Notify::inlineBotRequesting(false);
if (name == _inlineBotUsername) { if (name == _inlineBotUsername) {
_inlineBot = 0; _inlineBot = 0;
onCheckMentionDropdown(); onCheckMentionDropdown();

12
Telegram/SourceFiles/layout.cpp
View File

@ -764,10 +764,10 @@ LayoutOverviewDocument::LayoutOverviewDocument(DocumentData *document, HistoryIt
_thumbw = 0; _thumbw = 0;
} }
_extw = st::semiboldFont->width(_ext); _extw = st::overviewFileExtFont->width(_ext);
if (_extw > st::overviewFileSize - st::msgFileExtPadding * 2) { if (_extw > st::overviewFileSize - st::overviewFileExtPadding * 2) {
_ext = st::semiboldFont->elided(_ext, st::overviewFileSize - st::msgFileExtPadding * 2, Qt::ElideMiddle); _ext = st::overviewFileExtFont->elided(_ext, st::overviewFileSize - st::overviewFileExtPadding * 2, Qt::ElideMiddle);
_extw = st::semiboldFont->width(_ext); _extw = st::overviewFileExtFont->width(_ext);
} }
} }
@ -872,9 +872,9 @@ void LayoutOverviewDocument::paint(Painter &p, const QRect &clip, uint32 selecti
} else { } else {
p.fillRect(rthumb, documentColor(_colorIndex)); p.fillRect(rthumb, documentColor(_colorIndex));
if (!radial && loaded && !_ext.isEmpty()) { if (!radial && loaded && !_ext.isEmpty()) {
p.setFont(st::semiboldFont); p.setFont(st::overviewFileExtFont);
p.setPen(st::white); p.setPen(st::white);
p.drawText(rthumb.left() + (rthumb.width() - _extw) / 2, rthumb.top() + st::msgFileExtTop + st::semiboldFont->ascent, _ext); p.drawText(rthumb.left() + (rthumb.width() - _extw) / 2, rthumb.top() + st::overviewFileExtTop + st::overviewFileExtFont->ascent, _ext);
} }
} }
if (selected) { if (selected) {