Compare commits

...

4 Commits

Author SHA1 Message Date
John Preston
838a3b23c7 Beta version 2.5.5.
- Fix recording of audio in voice chats.
- Fix media viewer zoom and crashing.
2021-01-10 12:30:58 +04:00
23rd
a030911ad5 Fixed filling context menu in TabbedPanel between sections.
Fixed #10082.
2021-01-09 14:24:41 +03:00
John Preston
8ae1b10b91 Fix media viewer regression. 2021-01-09 13:55:55 +04:00
John Preston
adc8d6a6d1 Fix audio recording in voice chats. 2021-01-08 19:09:45 +04:00
14 changed files with 56 additions and 40 deletions

View File

@@ -9,7 +9,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="2.5.4.0" />
Version="2.5.5.0" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>

View File

@@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,5,4,0
PRODUCTVERSION 2,5,4,0
FILEVERSION 2,5,5,0
PRODUCTVERSION 2,5,5,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop"
VALUE "FileVersion", "2.5.4.0"
VALUE "FileVersion", "2.5.5.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2021"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "2.5.4.0"
VALUE "ProductVersion", "2.5.5.0"
END
END
BLOCK "VarFileInfo"

View File

@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,5,4,0
PRODUCTVERSION 2,5,4,0
FILEVERSION 2,5,5,0
PRODUCTVERSION 2,5,5,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop Updater"
VALUE "FileVersion", "2.5.4.0"
VALUE "FileVersion", "2.5.5.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2021"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "2.5.4.0"
VALUE "ProductVersion", "2.5.5.0"
END
END
BLOCK "VarFileInfo"

View File

@@ -877,11 +877,8 @@ void TabbedSelector::scrollToY(int y) {
}
}
void TabbedSelector::contextMenuEvent(QContextMenuEvent *e) {
void TabbedSelector::showMenuWithType(SendMenu::Type type) {
_menu = base::make_unique_q<Ui::PopupMenu>(this);
const auto type = _sendMenuType
? _sendMenuType()
: SendMenu::Type::Disabled;
currentTab()->widget()->fillContextMenu(_menu, type);
if (!_menu->actions().empty()) {
@@ -889,6 +886,13 @@ void TabbedSelector::contextMenuEvent(QContextMenuEvent *e) {
}
}
rpl::producer<> TabbedSelector::contextMenuRequested() const {
return events(
) | rpl::filter([=](not_null<QEvent*> e) {
return e->type() == QEvent::ContextMenu;
}) | rpl::to_empty;
}
TabbedSelector::Inner::Inner(
QWidget *parent,
not_null<Window::SessionController*> controller)

View File

@@ -82,6 +82,7 @@ public:
rpl::producer<> cancelled() const;
rpl::producer<> checkForHide() const;
rpl::producer<> slideFinished() const;
rpl::producer<> contextMenuRequested() const;
void setRoundRadius(int radius);
void refreshStickers();
@@ -109,9 +110,7 @@ public:
_beforeHidingCallback = std::move(callback);
}
void setSendMenuType(Fn<SendMenu::Type()> &&callback) {
_sendMenuType = std::move(callback);
}
void showMenuWithType(SendMenu::Type type);
// Float player interface.
bool floatPlayerHandleWheelEvent(QEvent *e);
@@ -127,7 +126,6 @@ public:
protected:
void paintEvent(QPaintEvent *e) override;
void resizeEvent(QResizeEvent *e) override;
void contextMenuEvent(QContextMenuEvent *e) override;
private:
class Tab {
@@ -228,8 +226,6 @@ private:
Fn<void(SelectorTab)> _afterShownCallback;
Fn<void(SelectorTab)> _beforeHidingCallback;
Fn<SendMenu::Type()> _sendMenuType;
rpl::event_stream<> _showRequests;
rpl::event_stream<> _slideFinished;

View File

@@ -99,6 +99,12 @@ std::map<int, const char*> BetaLogs() {
"- Fix media viewer updating when screen resolution is changed.\n"
},
{
2005005,
"- Fix recording of audio in voice chats.\n"
"- Fix media viewer zoom and crashing.\n"
},
};
};

View File

@@ -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 = 2005004;
constexpr auto AppVersionStr = "2.5.4";
constexpr auto AppVersion = 2005005;
constexpr auto AppVersionStr = "2.5.5";
constexpr auto AppBetaVersion = true;
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;

View File

@@ -846,6 +846,11 @@ void HistoryWidget::initTabbedSelector() {
return base::EventFilterResult::Continue;
});
auto filter = rpl::filter([=] {
return !isHidden();
});
using Selector = TabbedSelector;
selector->emojiChosen(
) | rpl::filter([=] {
return !isHidden() && !_field->isHidden();
@@ -854,27 +859,24 @@ void HistoryWidget::initTabbedSelector() {
}, lifetime());
selector->fileChosen(
) | rpl::filter([=] {
return !isHidden();
}) | rpl::start_with_next([=](TabbedSelector::FileChosen data) {
) | filter | rpl::start_with_next([=](Selector::FileChosen data) {
sendExistingDocument(data.document, data.options);
}, lifetime());
selector->photoChosen(
) | rpl::filter([=] {
return !isHidden();
}) | rpl::start_with_next([=](TabbedSelector::PhotoChosen data) {
) | filter | rpl::start_with_next([=](Selector::PhotoChosen data) {
sendExistingPhoto(data.photo, data.options);
}, lifetime());
selector->inlineResultChosen(
) | rpl::filter([=] {
return !isHidden();
}) | rpl::start_with_next([=](TabbedSelector::InlineChosen data) {
) | filter | rpl::start_with_next([=](Selector::InlineChosen data) {
sendInlineResult(data);
}, lifetime());
selector->setSendMenuType([=] { return sendMenuType(); });
selector->contextMenuRequested(
) | filter | rpl::start_with_next([=] {
selector->showMenuWithType(sendMenuType());
}, lifetime());
}
void HistoryWidget::supportInitAutocomplete() {

View File

@@ -1410,7 +1410,10 @@ void ComposeControls::initTabbedSelector() {
selector->inlineResultChosen(
) | rpl::start_to_stream(_inlineResultChosen, wrap->lifetime());
selector->setSendMenuType([=] { return sendMenuType(); });
selector->contextMenuRequested(
) | rpl::start_with_next([=] {
selector->showMenuWithType(sendMenuType());
}, wrap->lifetime());
}
void ComposeControls::initSendButton() {

View File

@@ -454,7 +454,7 @@ void OverlayWidget::moveToScreen() {
}
void OverlayWidget::updateGeometry() {
if (!Platform::IsMac()) {
if (Platform::IsLinux()) {
return;
}
const auto screen = windowHandle() && windowHandle()->screen()
@@ -483,8 +483,8 @@ void OverlayWidget::updateControlsGeometry() {
_saveMsg.moveTo((width() - _saveMsg.width()) / 2, (height() - _saveMsg.height()) / 2);
_photoRadialRect = QRect(QPoint((width() - st::radialSize.width()) / 2, (height() - st::radialSize.height()) / 2), st::radialSize);
resizeContentByScreenSize();
updateControls();
resizeContentByScreenSize();
update();
}

View File

@@ -1,7 +1,7 @@
AppVersion 2005004
AppVersion 2005005
AppVersionStrMajor 2.5
AppVersionStrSmall 2.5.4
AppVersionStr 2.5.4
AppVersionStrSmall 2.5.5
AppVersionStr 2.5.5
BetaChannel 1
AlphaVersion 0
AppVersionOriginal 2.5.4.beta
AppVersionOriginal 2.5.5.beta

View File

@@ -1,3 +1,8 @@
2.5.5 beta (10.01.21)
- Fix recording of audio in voice chats.
- Fix media viewer zoom and crashing.
2.5.4 beta (07.01.21)
- Implement new audio module code for calls and voice chats.