From bb30b71b8686bd017467b7df3335079c8c10b0ed Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 15 Feb 2016 14:23:45 +0300 Subject: [PATCH] 0.9.23 dev version, convertScale() added to inline result thumbs in some places --- Telegram/SourceFiles/application.cpp | 2 +- Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/history.cpp | 4 ++-- Telegram/SourceFiles/layout.cpp | 10 +++++----- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | 8 ++++---- Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 84520a5b7..0f2300491 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -1052,7 +1052,7 @@ void AppClass::checkMapVersion() { if (cPlatform() == dbipMac || cPlatform() == dbipMacOld) { versionFeatures = QString::fromUtf8("\xe2\x80\x94 Voice messages waveform visualizations\n\xe2\x80\x94 Bug fixes and other minor improvements");// .replace('@', qsl("@") + QChar(0x200D)); } else { - versionFeatures = QString::fromUtf8("\xe2\x80\x94 Testing new crash reporting system\n\xe2\x80\x94 Conversation history is centered in wide windows\n\xe2\x80\x94 New cute link and timestamp tooltips design\n\xe2\x80\x94 Ctrl+W or Ctrl+F4 closes Telegram window\n\xe2\x80\x94 Bug fixes and other minor improvements");// .replace('@', qsl("@") + QChar(0x200D)); + versionFeatures = QString::fromUtf8("\xe2\x80\x94 Voice messages waveform visualizations\n\xe2\x80\x94 Bug fixes and other minor improvements");// .replace('@', qsl("@") + QChar(0x200D)); } } else if (Local::oldMapVersion() < 9016) { versionFeatures = lng_new_version_text(lt_gifs_link, qsl("https://telegram.org/blog/gif-revolution"), lt_bots_link, qsl("https://telegram.org/blog/inline-bots")).trimmed(); diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 1816d479c..363e19b56 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -20,8 +20,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 9022; -static const wchar_t *AppVersionStr = L"0.9.22"; +static const int32 AppVersion = 9023; +static const wchar_t *AppVersionStr = L"0.9.23"; static const bool DevVersion = true; //#define BETA_VERSION (9019002ULL) // just comment this line to build public version diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 540f83bc6..890cd38b5 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -3754,7 +3754,7 @@ void HistoryVideo::unregItem(HistoryItem *item) { ImagePtr HistoryVideo::replyPreview() { if (_data->replyPreview->isNull() && !_data->thumb->isNull()) { if (_data->thumb->loaded()) { - int w = _data->thumb->width(), h = _data->thumb->height(); + int w = convertScale(_data->thumb->width()), h = convertScale(_data->thumb->height()); if (w <= 0) w = 1; if (h <= 0) h = 1; _data->replyPreview = ImagePtr(w > h ? _data->thumb->pix(w * st::msgReplyBarSize.height() / h, st::msgReplyBarSize.height()) : _data->thumb->pix(st::msgReplyBarSize.height()), "PNG"); @@ -3857,7 +3857,7 @@ void HistoryDocument::initDimensions(const HistoryItem *parent) { HistoryDocumentThumbed *thumbed = Get(); if (thumbed) { _data->thumb->load(); - int32 tw = _data->thumb->width(), th = _data->thumb->height(); + int32 tw = convertScale(_data->thumb->width()), th = convertScale(_data->thumb->height()); if (tw > th) { thumbed->_thumbw = (tw * st::msgFileThumbSize) / th; } else { diff --git a/Telegram/SourceFiles/layout.cpp b/Telegram/SourceFiles/layout.cpp index 20b5ad04c..549b442e8 100644 --- a/Telegram/SourceFiles/layout.cpp +++ b/Telegram/SourceFiles/layout.cpp @@ -756,7 +756,7 @@ LayoutOverviewDocument::LayoutOverviewDocument(DocumentData *document, HistoryIt if (withThumb()) { _data->thumb->load(); - int32 tw = _data->thumb->width(), th = _data->thumb->height(); + int32 tw = convertScale(_data->thumb->width()), th = convertScale(_data->thumb->height()); if (tw > th) { _thumbw = (tw * st::overviewFileSize) / th; } else { @@ -1651,7 +1651,7 @@ int32 LayoutInlineGif::content_width() const { return doc->dimensions.width(); } if (!doc->thumb->isNull()) { - return doc->thumb->width(); + return convertScale(doc->thumb->width()); } } else if (_result) { return _result->width; @@ -1666,7 +1666,7 @@ int32 LayoutInlineGif::content_height() const { return doc->dimensions.height(); } if (!doc->thumb->isNull()) { - return doc->thumb->height(); + return convertScale(doc->thumb->height()); } } else if (_result) { return _result->height; @@ -1920,7 +1920,7 @@ void LayoutInlineWebVideo::getState(TextLinkPtr &link, HistoryCursorState &curso void LayoutInlineWebVideo::prepareThumb(int32 width, int32 height) const { if (_result->thumb->loaded()) { if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) { - int32 w = qMax(_result->thumb->width(), 1), h = qMax(_result->thumb->height(), 1); + int32 w = qMax(convertScale(_result->thumb->width()), 1), h = qMax(convertScale(_result->thumb->height()), 1); if (w * height > h * width) { if (height < h) { w = w * height / h; @@ -2068,7 +2068,7 @@ void LayoutInlineArticle::prepareThumb(int32 width, int32 height) const { if (_result->thumb->loaded()) { if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) { - int32 w = qMax(_result->thumb->width(), 1), h = qMax(_result->thumb->height(), 1); + int32 w = qMax(convertScale(_result->thumb->width()), 1), h = qMax(convertScale(_result->thumb->height()), 1); if (w * height > h * width) { if (height < h) { w = w * height / h; diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 8bc5a45e0..468ce68fd 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.22 + 0.9.23 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 8dd9cd58c..036e34bc7 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,22,0 - PRODUCTVERSION 0,9,22,0 + FILEVERSION 0,9,23,0 + PRODUCTVERSION 0,9,23,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.22.0" + VALUE "FileVersion", "0.9.23.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.22.0" + VALUE "ProductVersion", "0.9.23.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 8454cab83..3f464ec55 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1720,7 +1720,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.22; + CURRENT_PROJECT_VERSION = 0.9.23; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1739,7 +1739,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.9.22; + CURRENT_PROJECT_VERSION = 0.9.23; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1768,10 +1768,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.22; + CURRENT_PROJECT_VERSION = 0.9.23; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.22; + DYLIB_CURRENT_VERSION = 0.9.23; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1909,10 +1909,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.22; + CURRENT_PROJECT_VERSION = 0.9.23; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.22; + DYLIB_CURRENT_VERSION = 0.9.23; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ""; diff --git a/Telegram/Version b/Telegram/Version index bcf8c071a..98e88320e 100644 --- a/Telegram/Version +++ b/Telegram/Version @@ -1,6 +1,6 @@ -AppVersion 9022 +AppVersion 9023 AppVersionStrMajor 0.9 -AppVersionStrSmall 0.9.22 -AppVersionStr 0.9.22 +AppVersionStrSmall 0.9.23 +AppVersionStr 0.9.23 DevChannel 1 BetaVersion 0 9019002