RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

version 0.6.11 fixed photos click area

This commit is contained in:
John Preston 2014-11-18 16:59:18 +03:00
parent 85ca7e0f05
commit 922ab40c75
14 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/DeployLinux.sh
View File

@ -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!";

4
Telegram/DeployLinux32.sh
View File

@ -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!"

4
Telegram/DeployMacWin.sh
View File

@ -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!"

4
Telegram/DeployWin.sh
View File

@ -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!"

4
Telegram/PrepareLinux.sh
View File

@ -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!"

4
Telegram/PrepareLinux32.sh
View File

@ -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!"

4
Telegram/PrepareMac.sh
View File

@ -1,5 +1,5 @@
AppVersionStr=0.6.10
AppVersion=6010
AppVersionStr=0.6.11
AppVersion=6011
echo ""
echo "Preparing version $AppVersionStr.."

2
Telegram/PrepareWin.bat
View File

@ -1,6 +1,6 @@
@echo OFF
set "AppVersionStr=0.6.10"
set "AppVersionStr=0.6.11"
echo.
echo Preparing version %AppVersionStr%..
echo.

6
Telegram/Setup.iss
View File

@ -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"

4
Telegram/SourceFiles/config.h
View File

@ -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";

10
Telegram/SourceFiles/history.cpp
View File

@ -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;

2
Telegram/Telegram.plist
View File

@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.6.10</string>
<string>0.6.11</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>NOTE</key>

BIN
Telegram/Telegram.rc
View File

Binary file not shown.

12
Telegram/Telegram.xcodeproj/project.pbxproj
View File

@ -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;