mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop into dev

Browse Source
This commit is contained in:
John Preston
2015-04-13 10:41:01 +01:00
parent 782c254ea0 b8f19786a1
commit 334b3ac706
8 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/application.cpp
View File

@@ -656,8 +656,8 @@ void Application::checkMapVersion() {
QString versionFeatures;
if (DevChannel && Local::oldMapVersion() < 8002) {
versionFeatures = QString::fromUtf8("\xe2\x80\x94 Link previews bugfixes\n\xe2\x80\x94 Links in preview descriptions are now clickable\n\xe2\x80\x94 Twitter and Instagram mentions and hashtags in previews are clickable\n\xe2\x80\x94 Fixed file uploading\n\xe2\x80\x94 Fixed photo, document and sticker forwarding").replace('@', qsl("@") + QChar(0x200D));
} else if (!DevChannel && Local::oldMapVersion() < 8003) {
versionFeatures = lang(lng_new_version_text).trimmed();
} else if (!DevChannel && Local::oldMapVersion() < 8004) {
versionFeatures = lang(lng_new_version_minor).trimmed();
}
if (!versionFeatures.isEmpty()) {
versionFeatures = lng_new_version_wrap(lt_version, QString::fromStdWString(AppVersionStr), lt_changes, versionFeatures, lt_link, qsl("https://desktop.telegram.org/#changelog"));

4
Telegram/SourceFiles/config.h
View File

@@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/
#pragma once
static const int32 AppVersion = 8003;
static const wchar_t *AppVersionStr = L"0.8.3";
static const int32 AppVersion = 8004;
static const wchar_t *AppVersionStr = L"0.8.4";
static const bool DevChannel = false;
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";

5
Telegram/SourceFiles/mainwidget.cpp
View File

@@ -1138,6 +1138,11 @@ void MainWidget::itemReplaced(HistoryItem *oldItem, HistoryItem *newItem) {
void MainWidget::itemResized(HistoryItem *row, bool scrollToIt) {
if (!row || (history.peer() == row->history()->peer && !row->detached())) {
history.itemResized(row, scrollToIt);
} else if (row) {
row->history()->width = 0;
if (history.peer() == row->history()->peer) {
history.resizeEvent(0);
}
}
if (overview) {
overview->itemResized(row, scrollToIt);