From 51f9e8f681901e637614d4dbcc2218c0467787cc Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 13 Apr 2015 09:54:06 +0100 Subject: [PATCH 1/2] links preview resize fixed, version 0.8.4 --- Telegram/PrepareWin.bat | 8 ++++---- Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/mainwidget.cpp | 5 +++++ Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5532 -> 5532 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index f18a600f7e..fa71d7bac3 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,9 +1,9 @@ @echo OFF -set "AppVersion=8003" -set "AppVersionStrSmall=0.8.3" -set "AppVersionStr=0.8.3" -set "AppVersionStrFull=0.8.3.0" +set "AppVersion=8004" +set "AppVersionStrSmall=0.8.4" +set "AppVersionStr=0.8.4" +set "AppVersionStrFull=0.8.4.0" set "DevChannel=0" if %DevChannel% neq 0 goto preparedev diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 87ca86a0b9..6e26233eab 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 8003; -static const wchar_t *AppVersionStr = L"0.8.3"; +static const int32 AppVersion = 8004; +static const wchar_t *AppVersionStr = L"0.8.4"; static const bool DevChannel = false; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index f36cec797e..8fefcad99f 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -1138,6 +1138,11 @@ void MainWidget::itemReplaced(HistoryItem *oldItem, HistoryItem *newItem) { void MainWidget::itemResized(HistoryItem *row, bool scrollToIt) { if (!row || (history.peer() == row->history()->peer && !row->detached())) { history.itemResized(row, scrollToIt); + } else if (row) { + row->history()->width = 0; + if (history.peer() == row->history()->peer) { + history.resizeEvent(0); + } } if (overview) { overview->itemResized(row, scrollToIt); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 1fd75ca6e0..9075382d7e 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.3 + 0.8.4 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 60f8116ece462172dc84856429c4d6616bd6a17e..f201743289f7f3d2d0c0a87e22cbf7804d3aac45 100644 GIT binary patch delta 50 zcmbQEJx6;(0WYJ; Date: Mon, 13 Apr 2015 10:05:47 +0100 Subject: [PATCH 2/2] 0.8.4 changelog --- Telegram/SourceFiles/application.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 33c88235a2..4fde54dfe9 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -656,8 +656,8 @@ void Application::checkMapVersion() { QString versionFeatures; if (DevChannel && Local::oldMapVersion() < 8002) { versionFeatures = QString::fromUtf8("\xe2\x80\x94 Link previews bugfixes\n\xe2\x80\x94 Links in preview descriptions are now clickable\n\xe2\x80\x94 Twitter and Instagram mentions and hashtags in previews are clickable\n\xe2\x80\x94 Fixed file uploading\n\xe2\x80\x94 Fixed photo, document and sticker forwarding").replace('@', qsl("@") + QChar(0x200D)); - } else if (!DevChannel && Local::oldMapVersion() < 8003) { - versionFeatures = lang(lng_new_version_text).trimmed(); + } else if (!DevChannel && Local::oldMapVersion() < 8004) { + versionFeatures = lang(lng_new_version_minor).trimmed(); } if (!versionFeatures.isEmpty()) { versionFeatures = lng_new_version_wrap(lt_version, QString::fromStdWString(AppVersionStr), lt_changes, versionFeatures, lt_link, qsl("https://desktop.telegram.org/#changelog"));