RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-20 23:27:23 +00:00
Code Issues Projects Releases Wiki Activity

Closed beta 10019005: inline bot cancel button fixed.

Browse Source
This commit is contained in:
John Preston 2016-11-11 12:05:05 +03:00
parent 55b1ba128d
commit d4d1d438be
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,19,4 FILEVERSION 0,10,19,5
PRODUCTVERSION 0,10,19,4 PRODUCTVERSION 0,10,19,5
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.10.19.4" VALUE "FileVersion", "0.10.19.5"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.19.4" VALUE "ProductVersion", "0.10.19.5"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,19,4 FILEVERSION 0,10,19,5
PRODUCTVERSION 0,10,19,4 PRODUCTVERSION 0,10,19,5
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Updater" VALUE "FileDescription", "Telegram Updater"
VALUE "FileVersion", "0.10.19.4" VALUE "FileVersion", "0.10.19.5"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.19.4" VALUE "ProductVersion", "0.10.19.5"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
Telegram/SourceFiles/core/version.h
View File

@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "core/utils.h" #include "core/utils.h"
#define BETA_VERSION_MACRO (10019004ULL) #define BETA_VERSION_MACRO (10019005ULL)
constexpr int AppVersion = 10020; constexpr int AppVersion = 10020;
constexpr str_const AppVersionStr = "0.10.20"; constexpr str_const AppVersionStr = "0.10.20";

15
Telegram/SourceFiles/historywidget.cpp
View File

@ -3274,8 +3274,13 @@ void HistoryWidget::onTextChange() {
_send->hide(); _send->hide();
updateMouseTracking(); updateMouseTracking();
mouseMoveEvent(0); mouseMoveEvent(0);
} else if (!_field->isHidden() && _send->isHidden()) { } else if (!_field->isHidden() && _send->isHidden() && (!_inlineBotCancel || _inlineBotCancel->isHidden())) {
_send->show(); if (_inlineBotCancel) {
_send->hide();
_inlineBotCancel->show();
} else {
_send->show();
}
updateMouseTracking(); updateMouseTracking();
_a_record.stop(); _a_record.stop();
_inRecord = _inField = false; _inRecord = _inField = false;
@ -4717,7 +4722,7 @@ void HistoryWidget::updateControlsVisibility() {
} }
void HistoryWidget::updateMouseTracking() { void HistoryWidget::updateMouseTracking() {
bool trackMouse = !_fieldBarCancel->isHidden() || _pinnedBar || (cHasAudioCapture() && _send->isHidden() && !_field->isHidden()); bool trackMouse = !_fieldBarCancel->isHidden() || _pinnedBar || (cHasAudioCapture() && _send->isHidden() && (!_inlineBotCancel || _inlineBotCancel->isHidden()) && !_field->isHidden());
setMouseTracking(trackMouse); setMouseTracking(trackMouse);
} }
@ -5542,7 +5547,7 @@ void HistoryWidget::animStop() {
void HistoryWidget::step_record(float64 ms, bool timer) { void HistoryWidget::step_record(float64 ms, bool timer) {
float64 dt = ms / st::historyComposeButton.duration; float64 dt = ms / st::historyComposeButton.duration;
if (dt >= 1 || !_send->isHidden() || isBotStart() || isBlocked()) { if (dt >= 1 || !_send->isHidden() || (_inlineBotCancel && !_inlineBotCancel->isHidden()) || isBotStart() || isBlocked()) {
_a_record.stop(); _a_record.stop();
a_recordDown.finish(); a_recordDown.finish();
a_recordCancelActive.finish(); a_recordCancelActive.finish();
@ -8748,7 +8753,7 @@ void HistoryWidget::paintEvent(QPaintEvent *e) {
if (_list) { if (_list) {
if (!_field->isHidden() || _recording) { if (!_field->isHidden() || _recording) {
drawField(p, r); drawField(p, r);
if (_send->isHidden()) { if (_send->isHidden() && (!_inlineBotCancel || _inlineBotCancel->isHidden())) {
drawRecordButton(p); drawRecordButton(p);
if (_recording) drawRecording(p); if (_recording) drawRecording(p);
} }

2
Telegram/build/version
View File

@ -3,4 +3,4 @@ AppVersionStrMajor 0.10
AppVersionStrSmall 0.10.20 AppVersionStrSmall 0.10.20
AppVersionStr 0.10.20 AppVersionStr 0.10.20
AlphaChannel 0 AlphaChannel 0
BetaVersion 10019004 BetaVersion 10019005