diff --git a/Telegram/DeployLinux.sh b/Telegram/DeployLinux.sh index e08f79dbb..6b7c5e1dc 100755 --- a/Telegram/DeployLinux.sh +++ b/Telegram/DeployLinux.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.10 -AppVersion=6010 +AppVersionStr=0.6.11 +AppVersion=6011 if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinuxupd$AppVersion" ]; then echo "tlinuxupd$AppVersion not found!"; diff --git a/Telegram/DeployLinux32.sh b/Telegram/DeployLinux32.sh index bc6d7d598..a854aed8e 100755 --- a/Telegram/DeployLinux32.sh +++ b/Telegram/DeployLinux32.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.10 -AppVersion=6010 +AppVersionStr=0.6.11 +AppVersion=6011 if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinux32upd$AppVersion" ]; then echo "tlinux32upd$AppVersion not found!" diff --git a/Telegram/DeployMacWin.sh b/Telegram/DeployMacWin.sh index d158f318f..acf1d1311 100755 --- a/Telegram/DeployMacWin.sh +++ b/Telegram/DeployMacWin.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.10 -AppVersion=6010 +AppVersionStr=0.6.11 +AppVersion=6011 if [ ! -f "./../Mac/Release/deploy/$AppVersionStr/tmacupd$AppVersion" ]; then echo "tmacupd$AppVersion not found!" diff --git a/Telegram/DeployWin.sh b/Telegram/DeployWin.sh index 2085bcf2c..490a2257b 100644 --- a/Telegram/DeployWin.sh +++ b/Telegram/DeployWin.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.10 -AppVersion=6010 +AppVersionStr=0.6.11 +AppVersion=6011 if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tupdate$AppVersion" ]; then echo "tupdate$AppVersion not found!" diff --git a/Telegram/PrepareLinux.sh b/Telegram/PrepareLinux.sh index e2ee19559..9c459b8b7 100755 --- a/Telegram/PrepareLinux.sh +++ b/Telegram/PrepareLinux.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.10 -AppVersion=6010 +AppVersionStr=0.6.11 +AppVersion=6011 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then echo "Deploy folder for version $AppVersionStr already exists!" diff --git a/Telegram/PrepareLinux32.sh b/Telegram/PrepareLinux32.sh index c85796395..273c89e13 100755 --- a/Telegram/PrepareLinux32.sh +++ b/Telegram/PrepareLinux32.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.10 -AppVersion=6010 +AppVersionStr=0.6.11 +AppVersion=6011 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then echo "Deploy folder for version $AppVersionStr already exists!" diff --git a/Telegram/PrepareMac.sh b/Telegram/PrepareMac.sh index 920bfea13..3b29a3619 100755 --- a/Telegram/PrepareMac.sh +++ b/Telegram/PrepareMac.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.10 -AppVersion=6010 +AppVersionStr=0.6.11 +AppVersion=6011 echo "" echo "Preparing version $AppVersionStr.." diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 8cfee8704..4e508f9d3 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,6 +1,6 @@ @echo OFF -set "AppVersionStr=0.6.10" +set "AppVersionStr=0.6.11" echo. echo Preparing version %AppVersionStr%.. echo. diff --git a/Telegram/Setup.iss b/Telegram/Setup.iss index ebe754614..a2e31eca8 100644 --- a/Telegram/Setup.iss +++ b/Telegram/Setup.iss @@ -3,9 +3,9 @@ #define MyAppShortName "Telegram" #define MyAppName "Telegram Desktop" -#define MyAppVersion "0.6.10" -#define MyAppVersionZero "0.6.10" -#define MyAppFullVersion "0.6.10.0" +#define MyAppVersion "0.6.11" +#define MyAppVersionZero "0.6.11" +#define MyAppFullVersion "0.6.11.0" #define MyAppPublisher "Telegram Messenger LLP" #define MyAppURL "https://tdesktop.com" #define MyAppExeName "Telegram.exe" diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 10b3e17a7..6fa2f9959 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com */ #pragma once -static const int32 AppVersion = 6010; -static const wchar_t *AppVersionStr = L"0.6.10"; +static const int32 AppVersion = 6011; +static const wchar_t *AppVersionStr = L"0.6.11"; 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 ea493e35b..516a07195 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -3849,7 +3849,10 @@ int32 HistoryMessage::resize(int32 width, bool dontRecountText, const HistoryIte bool HistoryMessage::hasPoint(int32 x, int32 y) const { int32 left = _out ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth; - if (_media && _media->maxWidth() > mwidth) mwidth = _media->maxWidth(); + if (_media) { + if (_media->maxWidth() > mwidth) mwidth = _media->maxWidth(); + if (_media->currentWidth() < mwidth) mwidth = _media->currentWidth(); + } if (width > mwidth) { if (_out) left += width - mwidth; width = mwidth; @@ -3876,7 +3879,10 @@ void HistoryMessage::getState(TextLinkPtr &lnk, bool &inText, int32 x, int32 y) lnk = TextLinkPtr(); int32 left = _out ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth; - if (_media && _media->maxWidth() > mwidth) mwidth = _media->maxWidth(); + if (_media) { + if (_media->maxWidth() > mwidth) mwidth = _media->maxWidth(); + if (_media->currentWidth() < mwidth) mwidth = _media->currentWidth(); + } if (width > mwidth) { if (_out) left += width - mwidth; width = mwidth; diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 8159c7425..fd626455d 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.6.10 + 0.6.11 CFBundleSignature ???? NOTE diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 899a76393..25fb32ece 100644 Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index da2060a20..bd4359d8b 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1521,7 +1521,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.6.10; + CURRENT_PROJECT_VERSION = 0.6.11; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1539,7 +1539,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.6.10; + CURRENT_PROJECT_VERSION = 0.6.11; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1565,10 +1565,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.6.10; + CURRENT_PROJECT_VERSION = 0.6.11; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.6; - DYLIB_CURRENT_VERSION = 0.6.10; + DYLIB_CURRENT_VERSION = 0.6.11; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1708,10 +1708,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.6.10; + CURRENT_PROJECT_VERSION = 0.6.11; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.6; - DYLIB_CURRENT_VERSION = 0.6.10; + DYLIB_CURRENT_VERSION = 0.6.11; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;