From e5ec3b6199f0e814099305a4773bdb08e1365ac8 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 5 Apr 2016 12:05:32 +0400 Subject: [PATCH] New version 0.9.40 --- Telegram/SourceFiles/config.h | 6 +++--- Telegram/SourceFiles/historywidget.cpp | 14 +++++++------- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | 8 ++++---- Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version | 8 ++++---- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 270dc855f..ac4c24458 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -20,9 +20,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 9039; -static const wchar_t *AppVersionStr = L"0.9.39"; -static const bool DevVersion = true; +static const int32 AppVersion = 9040; +static const wchar_t *AppVersionStr = L"0.9.40"; +static const bool DevVersion = false; //#define BETA_VERSION (9034004ULL) // just comment this line to build public version static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index b326fe304..451ebeb02 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -193,14 +193,9 @@ void HistoryInner::enumerateUserpicsInHistory(History *h, int htop, Method metho } void HistoryInner::paintEvent(QPaintEvent *e) { - if (App::wnd() && App::wnd()->contentOverlapped(this, e)) { + if (!App::main() || (App::wnd() && App::wnd()->contentOverlapped(this, e))) { return; } - - if (!App::main()) { - return; - } - if (hasPendingResizedItems()) { return; } @@ -8004,7 +7999,12 @@ void HistoryWidget::drawPinnedBar(Painter &p) { } void HistoryWidget::paintEvent(QPaintEvent *e) { - if (!App::main() || (App::wnd() && App::wnd()->contentOverlapped(this, e))) return; + if (!App::main() || (App::wnd() && App::wnd()->contentOverlapped(this, e))) { + return; + } + if (hasPendingResizedItems()) { + updateListSize(); + } Painter p(this); QRect r(e->rect()); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index d2af99bfb..78587e8c4 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.39 + 0.9.40 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index f9be16de3..74292c28c 100644 --- a/Telegram/Telegram.rc +++ b/Telegram/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,39,0 - PRODUCTVERSION 0,9,39,0 + FILEVERSION 0,9,40,0 + PRODUCTVERSION 0,9,40,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.39.0" + VALUE "FileVersion", "0.9.40.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.39.0" + VALUE "ProductVersion", "0.9.40.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index bed09ed1b..751054050 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1772,7 +1772,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.39; + CURRENT_PROJECT_VERSION = 0.9.40; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1791,7 +1791,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.9.39; + CURRENT_PROJECT_VERSION = 0.9.40; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1820,10 +1820,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.39; + CURRENT_PROJECT_VERSION = 0.9.40; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.39; + DYLIB_CURRENT_VERSION = 0.9.40; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1961,10 +1961,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.39; + CURRENT_PROJECT_VERSION = 0.9.40; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.39; + DYLIB_CURRENT_VERSION = 0.9.40; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ""; diff --git a/Telegram/Version b/Telegram/Version index 355c48b4b..6a33d5c33 100644 --- a/Telegram/Version +++ b/Telegram/Version @@ -1,6 +1,6 @@ -AppVersion 9039 +AppVersion 9040 AppVersionStrMajor 0.9 -AppVersionStrSmall 0.9.39 -AppVersionStr 0.9.39 -DevChannel 1 +AppVersionStrSmall 0.9.40 +AppVersionStr 0.9.40 +DevChannel 0 BetaVersion 0 9034004