From 07463dda6b2aa64af3cbe3f84c79d4f81045ec4a Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 24 Mar 2015 14:11:38 +0300 Subject: [PATCH] improved 0.7.24.dev, changelog added --- Telegram/SourceFiles/application.cpp | 4 ++-- Telegram/SourceFiles/dropdown.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index b859e015f8..5c89084c11 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -653,8 +653,8 @@ void Application::checkMapVersion() { psRegisterCustomScheme(); if (Local::oldMapVersion()) { QString versionFeatures; - if (DevChannel && Local::oldMapVersion() < 7022) { - versionFeatures = QString::fromUtf8("\xe2\x80\x94 Forward messages with comment or sticker before them\n\xe2\x80\x94 Recent used hashtags autocomplete in message field and search field\n\xe2\x80\x94 Move from reply to original message and back by an arrow in the bottom"); + if (DevChannel && Local::oldMapVersion() < 7024) { + versionFeatures = QString::fromUtf8("\xe2\x80\x94 Forward messages with comment or sticker before them\n\xe2\x80\x94 Recent hashtags autocomplete in message and search fields\n\xe2\x80\x94 Move from reply to original message and back"); } else if (!DevChannel && Local::oldMapVersion() < 7023) { versionFeatures = lang(lng_new_version7022).trimmed().replace('@', qsl("@") + QChar(0x200D)); } diff --git a/Telegram/SourceFiles/dropdown.cpp b/Telegram/SourceFiles/dropdown.cpp index 5d161f4c65..e2b7f56dd4 100644 --- a/Telegram/SourceFiles/dropdown.cpp +++ b/Telegram/SourceFiles/dropdown.cpp @@ -889,6 +889,7 @@ void MentionsInner::paintEvent(QPaintEvent *e) { int32 atwidth = st::mentionFont->m.width('@'), hashwidth = st::mentionFont->m.width('#'); int32 availwidth = width() - 2 * st::mentionPadding.left() - st::mentionPhotoSize - 2 * st::mentionPadding.right(); + int32 htagleft = st::btnAttachPhoto.width + st::taMsgField.textMrg.left() - st::dlgShadow, htagwidth = width() - st::mentionPadding.right() - htagleft; int32 from = qFloor(e->rect().top() / st::mentionHeight), to = qFloor(e->rect().bottom() / st::mentionHeight) + 1, last = _rows->isEmpty() ? _hrows->size() : _rows->size(); for (int32 i = from; i < to; ++i) { @@ -897,9 +898,9 @@ void MentionsInner::paintEvent(QPaintEvent *e) { if (i == _sel) p.fillRect(0, i * st::mentionHeight, width(), st::mentionHeight, st::dlgHoverBG->b); if (_rows->isEmpty()) { - QString tag = st::mentionFont->m.elidedText('#' + _hrows->at(last - i - 1), Qt::ElideRight, availwidth); + QString tag = st::mentionFont->m.elidedText('#' + _hrows->at(last - i - 1), Qt::ElideRight, htagwidth); p.setFont(st::mentionFont->f); - p.drawText(2 * st::mentionPadding.left() + st::mentionPhotoSize + st::mentionPadding.right(), i * st::mentionHeight + st::mentionTop + st::mentionFont->ascent, tag); + p.drawText(htagleft, i * st::mentionHeight + st::mentionTop + st::mentionFont->ascent, tag); } else { UserData *user = _rows->at(last - i - 1); QString uname = user->username; @@ -1092,7 +1093,7 @@ void MentionsDropdown::showFiltered(ChatData *chat, QString start) { const RecentHashtagPack &recent(cRecentWriteHashtags()); hrows.reserve(recent.size()); for (RecentHashtagPack::const_iterator i = recent.cbegin(), e = recent.cend(); i != e; ++i) { - if (_filter.size() > 1 && !i->first.startsWith(_filter.midRef(1), Qt::CaseInsensitive)) continue; + if (_filter.size() > 1 && (!i->first.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || i->first.size() + 1 == _filter.size())) continue; hrows.push_back(i->first); } }