Skip to content

Commit

Permalink
Beta version 5.4.2.
Browse files Browse the repository at this point in the history
- Select audio devices from one-on-one call window.
- Bug fixes and other minor improvements.
- New text layout testing.
  • Loading branch information
john-preston committed Aug 28, 2024
1 parent fed0946 commit e6405bc
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 26 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="5.4.1.0" />
Version="5.4.2.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 5,4,1,0
PRODUCTVERSION 5,4,1,0
FILEVERSION 5,4,2,0
PRODUCTVERSION 5,4,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -62,10 +62,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop"
VALUE "FileVersion", "5.4.1.0"
VALUE "FileVersion", "5.4.2.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2024"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "5.4.1.0"
VALUE "ProductVersion", "5.4.2.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 5,4,1,0
PRODUCTVERSION 5,4,1,0
FILEVERSION 5,4,2,0
PRODUCTVERSION 5,4,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -53,10 +53,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop Updater"
VALUE "FileVersion", "5.4.1.0"
VALUE "FileVersion", "5.4.2.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2024"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "5.4.1.0"
VALUE "ProductVersion", "5.4.2.0"
END
END
BLOCK "VarFileInfo"
Expand Down
6 changes: 3 additions & 3 deletions Telegram/SourceFiles/core/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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 = 5004001;
constexpr auto AppVersionStr = "5.4.1";
constexpr auto AppBetaVersion = false;
constexpr auto AppVersion = 5004002;
constexpr auto AppVersionStr = "5.4.2";
constexpr auto AppBetaVersion = true;
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
22 changes: 14 additions & 8 deletions Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,19 @@ namespace {

constexpr auto kMaxTopPaidShown = 3;

struct TopReactorKey {
std::shared_ptr<DynamicImage> photo;
int count = 0;
QString name;

friend inline auto operator<=>(
const TopReactorKey &,
const TopReactorKey &) = default;
friend inline bool operator==(
const TopReactorKey &,
const TopReactorKey &) = default;
};

struct Discreter {
Fn<int(float64)> ratioToValue;
Fn<float64(int)> valueToRatio;
Expand Down Expand Up @@ -249,14 +262,7 @@ void FillTopReactors(
object_ptr<FixedHeightWidget>(container, height),
st::paidReactTopMargin));
const auto parent = wrap->entity();
struct Key {
std::shared_ptr<DynamicImage> photo;
int count = 0;
QString name;

inline auto operator<=>(const Key &) const = default;
inline bool operator==(const Key &) const = default;
};
using Key = TopReactorKey;
struct State {
base::flat_map<Key, not_null<RpWidget*>> cache;
std::vector<not_null<RpWidget*>> widgets;
Expand Down
10 changes: 5 additions & 5 deletions Telegram/build/version
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AppVersion 5004001
AppVersion 5004002
AppVersionStrMajor 5.4
AppVersionStrSmall 5.4.1
AppVersionStr 5.4.1
BetaChannel 0
AppVersionStrSmall 5.4.2
AppVersionStr 5.4.2
BetaChannel 1
AlphaVersion 0
AppVersionOriginal 5.4.1
AppVersionOriginal 5.4.2.beta
2 changes: 1 addition & 1 deletion Telegram/lib_ui
6 changes: 6 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
5.4.2 beta (28.08.24)

- Select audio devices from one-on-one call window.
- Bug fixes and other minor improvements.
- New text layout testing.

5.4.1 (17.08.24)

- Fix crash when sending Star Reaction in comments.
Expand Down

0 comments on commit e6405bc

Please sign in to comment.