From 5bb83afc7ae077a06a8f494e5a31d51feafb3c46 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 21 May 2015 00:33:39 +0300 Subject: [PATCH] version 0.8.16 stable - fixed select of a sticker reply --- Telegram/PrepareWin.bat | 10 +++++----- Telegram/SourceFiles/app.cpp | 2 +- Telegram/SourceFiles/application.cpp | 2 +- Telegram/SourceFiles/config.h | 6 +++--- Telegram/SourceFiles/history.cpp | 2 +- Telegram/SourceFiles/mtproto/mtp.cpp | 2 +- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 9ff5e0778..bcb0bf972 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,10 +1,10 @@ @echo OFF -set "AppVersion=8015" -set "AppVersionStrSmall=0.8.15" -set "AppVersionStr=0.8.15" -set "AppVersionStrFull=0.8.15.0" -set "DevChannel=1" +set "AppVersion=8016" +set "AppVersionStrSmall=0.8.16" +set "AppVersionStr=0.8.16" +set "AppVersionStrFull=0.8.16.0" +set "DevChannel=0" if %DevChannel% neq 0 goto preparedev diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index 64ae9ee1a..155f303f1 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -2160,7 +2160,7 @@ namespace App { float64 alpha = st::msgServiceBg->c.alphaF(); _msgServiceBg = style::color(r, g, b, qRound(alpha * 0xFF)); - float64 alphaSel = alphaSel = st::msgServiceSelectBg->c.alphaF(), addSel = (1. - ((1. - alphaSel) / (1. - alpha))) * 0xFF; + float64 alphaSel = st::msgServiceSelectBg->c.alphaF(), addSel = (1. - ((1. - alphaSel) / (1. - alpha))) * 0xFF; uchar rsel = snap(qRound(((1. - alphaSel) * r + addSel) / alphaSel), 0, 0xFF); uchar gsel = snap(qRound(((1. - alphaSel) * g + addSel) / alphaSel), 0, 0xFF); uchar bsel = snap(qRound(((1. - alphaSel) * b + addSel) / alphaSel), 0, 0xFF); diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index dbf28d4ec..67c4808c2 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -664,7 +664,7 @@ void Application::checkMapVersion() { QString versionFeatures; if (DevChannel && Local::oldMapVersion() < 8015) { versionFeatures = QString::fromUtf8("\xe2\x80\x94 Video captions are displayed\n\xe2\x80\x94 Photo captions are displayed in photo viewer\n\xe2\x80\x94 Round corners for messages").replace('@', qsl("@") + QChar(0x200D)); - } else if (!DevChannel && Local::oldMapVersion() < 8013) { + } else if (!DevChannel && Local::oldMapVersion() < 8016) { versionFeatures = lang(lng_new_version_text).trimmed(); } if (!versionFeatures.isEmpty()) { diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index af4196e44..4a2aa0637 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 8015; -static const wchar_t *AppVersionStr = L"0.8.15"; -static const bool DevChannel = true; +static const int32 AppVersion = 8016; +static const wchar_t *AppVersionStr = L"0.8.16"; +static const bool DevChannel = false; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 09bc64b93..cc4cf955b 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -3061,7 +3061,7 @@ void HistorySticker::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 rw = width - usew, rh = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom(); int32 rx = parent->out() ? 0 : usew, ry = _height - rh; - App::roundRect(p, rx, ry, rw, rh, App::msgServiceBg(), selected ? ServiceSelectedCorners : ServiceCorners, &App::msgServiceSelectBg()); + App::roundRect(p, rx, ry, rw, rh, selected ? App::msgServiceSelectBg() : App::msgServiceBg(), selected ? ServiceSelectedCorners : ServiceCorners); reply->drawReplyTo(p, rx + st::msgReplyPadding.left(), ry, rw - st::msgReplyPadding.left() - st::msgReplyPadding.right(), selected, true); } diff --git a/Telegram/SourceFiles/mtproto/mtp.cpp b/Telegram/SourceFiles/mtproto/mtp.cpp index 4f4be3b1c..ac558f308 100644 --- a/Telegram/SourceFiles/mtproto/mtp.cpp +++ b/Telegram/SourceFiles/mtproto/mtp.cpp @@ -645,7 +645,7 @@ namespace MTP { dcMask %= _mtp_internal::dcShift; for (Sessions::const_iterator i = sessions.cbegin(), e = sessions.cend(); i != e; ++i) { - if (((*i)->getDcWithShift() % _mtp_internal::dcShift) == dcMask) { + if (((*i)->getDcWithShift() % int(_mtp_internal::dcShift)) == dcMask) { (*i)->restart(); } } diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 4447ccd7c..eab1cc13a 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.15 + 0.8.16 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 0f43649812322e9d95ec9ca3308fb38afbff7131..3f9a8ef15819d287b09fc7cdd238969e106ff455 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig_J