diff --git a/Telegram/PrepareLinux.sh b/Telegram/PrepareLinux.sh
index 1fc2afb4a..64ec7876d 100755
--- a/Telegram/PrepareLinux.sh
+++ b/Telegram/PrepareLinux.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.5.14
-AppVersion=5014
+AppVersionStr=0.5.15
+AppVersion=5015
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!"
diff --git a/Telegram/PrepareLinux32.sh b/Telegram/PrepareLinux32.sh
index 86a083a81..f127ee219 100755
--- a/Telegram/PrepareLinux32.sh
+++ b/Telegram/PrepareLinux32.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.5.14
-AppVersion=5014
+AppVersionStr=0.5.15
+AppVersion=5015
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!"
diff --git a/Telegram/PrepareMac.sh b/Telegram/PrepareMac.sh
index 69087fe31..d8b0db8a0 100755
--- a/Telegram/PrepareMac.sh
+++ b/Telegram/PrepareMac.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.5.14
-AppVersion=5014
+AppVersionStr=0.5.15
+AppVersion=5015
if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!"
diff --git a/Telegram/Setup.iss b/Telegram/Setup.iss
index 958e5f534..7a4cce25c 100644
--- a/Telegram/Setup.iss
+++ b/Telegram/Setup.iss
@@ -3,9 +3,9 @@
#define MyAppShortName "Telegram"
#define MyAppName "Telegram Win (Unofficial)"
-#define MyAppVersion "0.5.14"
-#define MyAppVersionZero "0.5.14"
-#define MyAppFullVersion "0.5.14.0"
+#define MyAppVersion "0.5.15"
+#define MyAppVersionZero "0.5.15"
+#define MyAppFullVersion "0.5.15.0"
#define MyAppPublisher "Telegram (Unofficial)"
#define MyAppURL "https://tdesktop.com"
#define MyAppExeName "Telegram.exe"
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 3ef864f17..47acced1c 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
*/
#pragma once
-static const int32 AppVersion = 5014;
-static const wchar_t *AppVersionStr = L"0.5.14";
+static const int32 AppVersion = 5015;
+static const wchar_t *AppVersionStr = L"0.5.15";
#ifdef Q_OS_WIN
static const wchar_t *AppName = L"Telegram Win (Unofficial)";
#else
diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
index 8909dbf25..0eeb69afe 100644
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@@ -1087,8 +1087,9 @@ HistoryItem *History::doAddToBack(HistoryBlock *to, bool newBlock, HistoryItem *
HistoryMedia *media = adding->getMedia(true);
if (media && media->type() == MediaTypePhoto) {
if (_photosOverviewIds.constFind(adding->id) == _photosOverviewIds.cend()) {
- _photosOverview.push_front(adding->id);
+ _photosOverview.push_back(adding->id);
_photosOverviewIds.insert(adding->id);
+ if (_photosOverviewCount > 0) ++_photosOverviewCount;
if (App::wnd()) App::wnd()->mediaOverviewUpdated(peer);
}
}
@@ -1727,6 +1728,12 @@ void HistoryItem::destroy() {
for (History::MediaOverview::iterator i = history()->_photosOverview.begin(), e = history()->_photosOverview.end(); i != e; ++i) {
if ((*i) == id) {
history()->_photosOverview.erase(i);
+ if (history()->_photosOverviewCount > 0) {
+ --history()->_photosOverviewCount;
+ if (!history()->_photosOverviewCount) {
+ history()->_photosOverviewCount = -1;
+ }
+ }
break;
}
}
@@ -1848,7 +1855,7 @@ HistoryMedia *HistoryPhoto::clone() const {
void HistoryPhoto::draw(QPainter &p, const HistoryItem *parent, const QString &time, int32 timeWidth, bool selected) const {
data->full->load(false, false);
bool out = parent->out();
- if (parent != App::contextItem()/* || App::wnd()->photoShown() != data*/) {
+ if (parent != App::contextItem() || /*App::wnd()->photoShown() != data*/ true) {
if (data->full->loaded()) {
p.drawPixmap(0, 0, data->full->pix(_maxw, _height));
} else {
diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp
index d4abcea4f..3a33a1132 100644
--- a/Telegram/SourceFiles/mediaview.cpp
+++ b/Telegram/SourceFiles/mediaview.cpp
@@ -61,8 +61,7 @@ void MediaView::moveToScreen() {
if (!geom.contains(_avail)) {
_avail = geom;
}
- _avail.setX(_avail.x() - geom.x());
- _avail.setY(_avail.y() - geom.y());
+ _avail.moveTo(0, 0);
_maxWidth = _avail.width() - 2 * st::medviewNavBarWidth;
_maxHeight = _avail.height() - st::medviewTopSkip - st::medviewBottomSkip;
_leftNav = QRect(0, 0, st::medviewNavBarWidth, height());
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 6cefcd0ae..9cdeaad84 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.5.14
+ 0.5.15
CFBundleSignature
????
NOTE
diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro
index 22f55def8..a2da7f2bc 100644
--- a/Telegram/Telegram.pro
+++ b/Telegram/Telegram.pro
@@ -88,6 +88,7 @@ SOURCES += \
./SourceFiles/historywidget.cpp \
./SourceFiles/langloaderplain.cpp \
./SourceFiles/layerwidget.cpp \
+ ./SourceFiles/mediaview.cpp \
./SourceFiles/profilewidget.cpp \
./SourceFiles/localimageloader.cpp \
./SourceFiles/logs.cpp \
@@ -156,6 +157,7 @@ HEADERS += \
./SourceFiles/historywidget.h \
./SourceFiles/langloaderplain.h \
./SourceFiles/layerwidget.h \
+ ./SourceFiles/mediaview.h \
./SourceFiles/profilewidget.h \
./SourceFiles/localimageloader.h \
./SourceFiles/logs.h \
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index 137da8bcd..0bd6ec1b7 100644
Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index aa1c586cc..7d5517ca2 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1468,7 +1468,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.5.14;
+ CURRENT_PROJECT_VERSION = 0.5.15;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1486,7 +1486,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 0.5.14;
+ CURRENT_PROJECT_VERSION = 0.5.15;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1511,10 +1511,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.5.14;
+ CURRENT_PROJECT_VERSION = 0.5.15;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.5;
- DYLIB_CURRENT_VERSION = 0.5.14;
+ DYLIB_CURRENT_VERSION = 0.5.15;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;
@@ -1640,10 +1640,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.5.14;
+ CURRENT_PROJECT_VERSION = 0.5.15;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.5;
- DYLIB_CURRENT_VERSION = 0.5.14;
+ DYLIB_CURRENT_VERSION = 0.5.15;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;