Skip to content

Commit

Permalink
Updated to 4.11.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
23rd committed Nov 3, 2023
2 parents 79d0e75 + 9e10a80 commit c948cbb
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Telegram/Resources/uwp/AppX/AppxManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="4.11.2.0" />
Version="4.11.3.0" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
Expand Down
8 changes: 4 additions & 4 deletions Telegram/Resources/winrc/Telegram.rc
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,11,2,0
PRODUCTVERSION 4,11,2,0
FILEVERSION 4,11,3,0
PRODUCTVERSION 4,11,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -62,10 +62,10 @@ BEGIN
BEGIN
VALUE "CompanyName", ""
VALUE "FileDescription", "Telegram Desktop"
VALUE "FileVersion", "4.11.2.0"
VALUE "FileVersion", "4.11.3.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2023"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "4.11.2.0"
VALUE "ProductVersion", "4.11.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Telegram/Resources/winrc/Updater.rc
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,11,2,0
PRODUCTVERSION 4,11,2,0
FILEVERSION 4,11,3,0
PRODUCTVERSION 4,11,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -53,10 +53,10 @@ BEGIN
BEGIN
VALUE "CompanyName", ""
VALUE "FileDescription", "Telegram Desktop Updater"
VALUE "FileVersion", "4.11.2.0"
VALUE "FileVersion", "4.11.3.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2023"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "4.11.2.0"
VALUE "ProductVersion", "4.11.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions Telegram/SourceFiles/core/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
constexpr auto AppName = "Telegram Desktop"_cs;
constexpr auto AppFile = "Telegram"_cs;
constexpr auto AppVersion = 4011002;
constexpr auto AppVersionStr = "4.11.2";
constexpr auto AppVersion = 4011003;
constexpr auto AppVersionStr = "4.11.3";
constexpr auto AppBetaVersion = false;
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
Original file line number Diff line number Diff line change
Expand Up @@ -1940,6 +1940,7 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
_header->replyToMessage({});
if (_preview) {
_preview->apply({ .removed = true });
_preview->setDisabled(false);
}
_canReplaceMedia = false;
_photoEditMedia = nullptr;
Expand Down Expand Up @@ -1978,6 +1979,7 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
_preview->apply(
Data::WebPageDraft::FromItem(item),
false);
_preview->setDisabled(media && !media->webpage());
}
return true;
}
Expand Down Expand Up @@ -2009,6 +2011,9 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
cancelForward();
}
_header->editMessage({});
if (_preview) {
_preview->setDisabled(false);
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -638,10 +638,11 @@ void DraftOptionsBox(
const auto &highlight = args.highlight;
const auto &clearOldDraft = args.clearOldDraft;
const auto resolveReply = [=] {
const auto current = state->quote.current();
auto result = draft.reply;
result.messageId = current.item->fullId();
result.quote = current.text;
if (const auto current = state->quote.current()) {
result.messageId = current.item->fullId();
result.quote = current.text;
}
return result;
};
const auto finish = [=](
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2577,7 +2577,6 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
: _overElement
? _overElement->data().get()
: nullptr;
const auto overItemView = viewForItem(overItem);
const auto clickedReaction = link
? link->property(
kReactionsCountEmojiProperty).value<Data::ReactionId>()
Expand Down
8 changes: 4 additions & 4 deletions Telegram/SourceFiles/info/profile/info_profile_actions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -573,11 +573,11 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
).text->setLinksTrusted();
}

const auto about = addInfoLine(
tr::lng_info_about_label(),
_topic ? rpl::single(TextWithEntities()) : AboutValue(_peer));
const auto about = addInfoLine(tr::lng_info_about_label(), _topic
? rpl::single(TextWithEntities())
: AboutWithIdValue(_peer));
if (!_topic) {
addTranslateToMenu(about.text, AboutValue(_peer));
addTranslateToMenu(about.text, AboutWithIdValue(_peer));
}
}
// ID
Expand Down
4 changes: 2 additions & 2 deletions Telegram/SourceFiles/statistics/chart_widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1018,9 +1018,9 @@ void ChartWidget::updateBottomDates() {
const auto k = _chartArea->width() / d;
const auto stepRaw = int(k / 6);

const auto by = int(_chartArea->width() / float64(_chartData.x.size()));
_bottomLine.captionIndicesOffset = 0
+ st::statisticsChartBottomCaptionMaxWidth
/ int(_chartArea->width() / float64(_chartData.x.size()));
+ st::statisticsChartBottomCaptionMaxWidth / std::max(by, 1);

const auto isCurrentNull = (_bottomLine.current.stepMinFast == 0);
if (!isCurrentNull
Expand Down
8 changes: 4 additions & 4 deletions Telegram/build/version
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AppVersion 4011002
AppVersion 4011003
AppVersionStrMajor 4.11
AppVersionStrSmall 4.11.2
AppVersionStr 4.11.2
AppVersionStrSmall 4.11.3
AppVersionStr 4.11.3
BetaChannel 0
AlphaVersion 0
AppVersionOriginal 4.11.2
AppVersionOriginal 4.11.3
6 changes: 6 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
4.11.3 (02.11.23)

- Fix adding a link to media captions in scheduled / comments.
- Fix crash in link preview options saving.
- Fix possible crash in statistics.

4.11.2 (01.11.23)

- Highlight quoted parts in jump-to-message from replies.
Expand Down

0 comments on commit c948cbb

Please sign in to comment.