Fix stickers on Linux 32 bit.

This commit is contained in:
John Preston 2019-07-15 14:17:22 +02:00
parent f2b3d9714f
commit 7a11d1e31f
9 changed files with 25 additions and 20 deletions

View file

@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/streaming/media_streaming_loader.h" // unique_ptr<Loader> #include "media/streaming/media_streaming_loader.h" // unique_ptr<Loader>
#include "media/streaming/media_streaming_reader.h" // make_shared<Reader> #include "media/streaming/media_streaming_reader.h" // make_shared<Reader>
#include "boxes/abstract_box.h" #include "boxes/abstract_box.h"
#include "platform/platform_info.h"
#include "passport/passport_form_controller.h" #include "passport/passport_form_controller.h"
#include "window/themes/window_theme.h" #include "window/themes/window_theme.h"
#include "lang/lang_keys.h" // tr::lng_deleted(tr::now) in user name #include "lang/lang_keys.h" // tr::lng_deleted(tr::now) in user name
@ -205,6 +206,14 @@ Session::Session(not_null<AuthSession*> session)
_cache->open(Local::cacheKey()); _cache->open(Local::cacheKey());
_bigFileCache->open(Local::cacheBigFileKey()); _bigFileCache->open(Local::cacheBigFileKey());
if constexpr (Platform::IsLinux()) {
const auto wasVersion = Local::oldMapVersion();
if (wasVersion >= 1007011 && wasVersion < 1007015) {
_bigFileCache->clear();
_cache->clearByTag(Data::kImageCacheTag);
}
}
setupContactViewsViewer(); setupContactViewsViewer();
setupChannelLeavingViewer(); setupChannelLeavingViewer();
setupPeerNameViewer(); setupPeerNameViewer();

View file

@ -548,17 +548,17 @@ const QPixmap &Image::pix(
checkSource(); checkSource();
if (w <= 0 || !width() || !height()) { if (w <= 0 || !width() || !height()) {
w = width(); w = width();
} else { } else {
w *= cIntRetinaFactor(); w *= cIntRetinaFactor();
h *= cIntRetinaFactor(); h *= cIntRetinaFactor();
} }
auto options = Option::Smooth | Option::None; auto options = Option::Smooth | Option::None;
auto k = PixKey(w, h, options); auto k = PixKey(w, h, options);
auto i = _sizesCache.constFind(k); auto i = _sizesCache.constFind(k);
if (i == _sizesCache.cend()) { if (i == _sizesCache.cend()) {
auto p = pixNoCache(origin, w, h, options); auto p = pixNoCache(origin, w, h, options);
p.setDevicePixelRatio(cRetinaFactor()); p.setDevicePixelRatio(cRetinaFactor());
i = _sizesCache.insert(k, p); i = _sizesCache.insert(k, p);
ActiveCache().increment(ComputeUsage(*i)); ActiveCache().increment(ComputeUsage(*i));
} }

View file

@ -1210,7 +1210,7 @@ InfoTopBar {
} }
LevelMeter { LevelMeter {
height: pixels; height: pixels;
lineWidth: pixels; lineWidth: pixels;
lineSpacing: pixels; lineSpacing: pixels;
lineCount: int; lineCount: int;
@ -1219,7 +1219,7 @@ LevelMeter {
} }
defaultLevelMeter: LevelMeter { defaultLevelMeter: LevelMeter {
height: 18px; height: 18px;
lineWidth: 3px; lineWidth: 3px;
lineSpacing: 5px; lineSpacing: 5px;
lineCount: 44; lineCount: 44;

@ -1 +1 @@
Subproject commit 40ccf084445c60a32d72d4811edf0efd0580dcaa Subproject commit 302b7f98b4f6846dc2414d9a5dc6c44864b92dd3

View file

@ -118,7 +118,7 @@
'<@(style_files)', '<@(style_files)',
'<!@(<(list_sources_command) <(qt_moc_list_sources_arg))', '<!@(<(list_sources_command) <(qt_moc_list_sources_arg))',
'telegram_sources.txt', 'telegram_sources.txt',
'<(res_loc)/langs/cloud_lang.strings', '<(res_loc)/langs/cloud_lang.strings',
'<(res_loc)/export_html/css/style.css', '<(res_loc)/export_html/css/style.css',
'<(res_loc)/export_html/js/script.js', '<(res_loc)/export_html/js/script.js',
'<(res_loc)/export_html/images/back.png', '<(res_loc)/export_html/images/back.png',

View file

@ -57,7 +57,7 @@
'<(src_loc)/base/flat_set.h', '<(src_loc)/base/flat_set.h',
'<(src_loc)/base/functors.h', '<(src_loc)/base/functors.h',
'<(src_loc)/base/index_based_iterator.h', '<(src_loc)/base/index_based_iterator.h',
'<(src_loc)/base/last_used_cache.h', '<(src_loc)/base/last_used_cache.h',
'<(src_loc)/base/match_method.h', '<(src_loc)/base/match_method.h',
'<(src_loc)/base/observer.cpp', '<(src_loc)/base/observer.cpp',
'<(src_loc)/base/observer.h', '<(src_loc)/base/observer.h',

View file

@ -60,7 +60,7 @@
'<(src_loc)/lottie/lottie_animation.h', '<(src_loc)/lottie/lottie_animation.h',
'<(src_loc)/lottie/lottie_cache.cpp', '<(src_loc)/lottie/lottie_cache.cpp',
'<(src_loc)/lottie/lottie_cache.h', '<(src_loc)/lottie/lottie_cache.h',
'<(src_loc)/lottie/lottie_common.cpp', '<(src_loc)/lottie/lottie_common.cpp',
'<(src_loc)/lottie/lottie_common.h', '<(src_loc)/lottie/lottie_common.h',
'<(src_loc)/lottie/lottie_frame_renderer.cpp', '<(src_loc)/lottie/lottie_frame_renderer.cpp',
'<(src_loc)/lottie/lottie_frame_renderer.h', '<(src_loc)/lottie/lottie_frame_renderer.h',

View file

@ -111,11 +111,7 @@
'<(rlottie_src)/vector/vstackallocator.h', '<(rlottie_src)/vector/vstackallocator.h',
'<(rlottie_src)/vector/vtaskqueue.h', '<(rlottie_src)/vector/vtaskqueue.h',
], ],
'conditions': [[ 'not build_win', { 'conditions': [[ 'build_macold', {
'defines': [
'RLOTTIE_WITH_STATIC_QT',
]
}], [ 'build_macold', {
'xcode_settings': { 'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ], 'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
}, },

View file

@ -7,11 +7,11 @@
{ {
'conditions': [ 'conditions': [
[ 'build_win', { [ 'build_win', {
'libraries': [ 'libraries': [
'-llibeay32', '-llibeay32',
'-lssleay32', '-lssleay32',
'-lCrypt32', '-lCrypt32',
], ],
'configurations': { 'configurations': {
'Debug': { 'Debug': {
'include_dirs': [ 'include_dirs': [
@ -30,7 +30,7 @@
], ],
}, },
}, },
}], [ 'build_macold', { }], [ 'build_macold', {
'xcode_settings': { 'xcode_settings': {
'OTHER_LDFLAGS': [ 'OTHER_LDFLAGS': [
'<(libs_loc)/macold/openssl/libssl.a', '<(libs_loc)/macold/openssl/libssl.a',