procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

0.9.23 dev version, convertScale() added to inline result thumbs in some places

This commit is contained in:
John Preston 2016-02-15 14:23:45 +03:00
parent 517358c8e9
commit bb30b71b86
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/application.cpp
View File

@ -1052,7 +1052,7 @@ void AppClass::checkMapVersion() {
if (cPlatform() == dbipMac || cPlatform() == dbipMacOld) { 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)); 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 { } 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) { } 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(); 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();

4
Telegram/SourceFiles/config.h
View File

@ -20,8 +20,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
*/ */
#pragma once #pragma once
static const int32 AppVersion = 9022; static const int32 AppVersion = 9023;
static const wchar_t *AppVersionStr = L"0.9.22"; static const wchar_t *AppVersionStr = L"0.9.23";
static const bool DevVersion = true; static const bool DevVersion = true;
//#define BETA_VERSION (9019002ULL) // just comment this line to build public version //#define BETA_VERSION (9019002ULL) // just comment this line to build public version

4
Telegram/SourceFiles/history.cpp
View File

@ -3754,7 +3754,7 @@ void HistoryVideo::unregItem(HistoryItem *item) {
ImagePtr HistoryVideo::replyPreview() { ImagePtr HistoryVideo::replyPreview() {
if (_data->replyPreview->isNull() && !_data->thumb->isNull()) { if (_data->replyPreview->isNull() && !_data->thumb->isNull()) {
if (_data->thumb->loaded()) { 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 (w <= 0) w = 1;
if (h <= 0) h = 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"); _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<HistoryDocumentThumbed>(); HistoryDocumentThumbed *thumbed = Get<HistoryDocumentThumbed>();
if (thumbed) { if (thumbed) {
_data->thumb->load(); _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) { if (tw > th) {
thumbed->_thumbw = (tw * st::msgFileThumbSize) / th; thumbed->_thumbw = (tw * st::msgFileThumbSize) / th;
} else { } else {

10
Telegram/SourceFiles/layout.cpp
View File

@ -756,7 +756,7 @@ LayoutOverviewDocument::LayoutOverviewDocument(DocumentData *document, HistoryIt
if (withThumb()) { if (withThumb()) {
_data->thumb->load(); _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) { if (tw > th) {
_thumbw = (tw * st::overviewFileSize) / th; _thumbw = (tw * st::overviewFileSize) / th;
} else { } else {
@ -1651,7 +1651,7 @@ int32 LayoutInlineGif::content_width() const {
return doc->dimensions.width(); return doc->dimensions.width();
} }
if (!doc->thumb->isNull()) { if (!doc->thumb->isNull()) {
return doc->thumb->width(); return convertScale(doc->thumb->width());
} }
} else if (_result) { } else if (_result) {
return _result->width; return _result->width;
@ -1666,7 +1666,7 @@ int32 LayoutInlineGif::content_height() const {
return doc->dimensions.height(); return doc->dimensions.height();
} }
if (!doc->thumb->isNull()) { if (!doc->thumb->isNull()) {
return doc->thumb->height(); return convertScale(doc->thumb->height());
} }
} else if (_result) { } else if (_result) {
return _result->height; return _result->height;
@ -1920,7 +1920,7 @@ void LayoutInlineWebVideo::getState(TextLinkPtr &link, HistoryCursorState &curso
void LayoutInlineWebVideo::prepareThumb(int32 width, int32 height) const { void LayoutInlineWebVideo::prepareThumb(int32 width, int32 height) const {
if (_result->thumb->loaded()) { if (_result->thumb->loaded()) {
if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) { 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 (w * height > h * width) {
if (height < h) { if (height < h) {
w = w * height / h; w = w * height / h;
@ -2068,7 +2068,7 @@ void LayoutInlineArticle::prepareThumb(int32 width, int32 height) const {
if (_result->thumb->loaded()) { if (_result->thumb->loaded()) {
if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) { 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 (w * height > h * width) {
if (height < h) { if (height < h) {
w = w * height / h; w = w * height / h;

2
Telegram/Telegram.plist
View File

@ -11,7 +11,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.9.22</string> <string>0.9.23</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>

8
Telegram/Telegram.rc
View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,22,0 FILEVERSION 0,9,23,0
PRODUCTVERSION 0,9,22,0 PRODUCTVERSION 0,9,23,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.9.22.0" VALUE "FileVersion", "0.9.23.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.22.0" VALUE "ProductVersion", "0.9.23.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

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

@ -1720,7 +1720,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.9.22; CURRENT_PROJECT_VERSION = 0.9.23;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@ -1739,7 +1739,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.9.22; CURRENT_PROJECT_VERSION = 0.9.23;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast; GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@ -1768,10 +1768,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.9.22; CURRENT_PROJECT_VERSION = 0.9.23;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.9; DYLIB_COMPATIBILITY_VERSION = 0.9;
DYLIB_CURRENT_VERSION = 0.9.22; DYLIB_CURRENT_VERSION = 0.9.23;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@ -1909,10 +1909,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.9.22; CURRENT_PROJECT_VERSION = 0.9.23;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.9; DYLIB_COMPATIBILITY_VERSION = 0.9;
DYLIB_CURRENT_VERSION = 0.9.22; DYLIB_CURRENT_VERSION = 0.9.23;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";

6
Telegram/Version
View File

@ -1,6 +1,6 @@
AppVersion 9022 AppVersion 9023
AppVersionStrMajor 0.9 AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.22 AppVersionStrSmall 0.9.23
AppVersionStr 0.9.22 AppVersionStr 0.9.23
DevChannel 1 DevChannel 1
BetaVersion 0 9019002 BetaVersion 0 9019002