From d4d1d438be8a04c5281d8794ca1858cfcedd5a73 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 11 Nov 2016 12:05:05 +0300 Subject: [PATCH] Closed beta 10019005: inline bot cancel button fixed. --- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 2 +- Telegram/SourceFiles/historywidget.cpp | 15 ++++++++++----- Telegram/build/version | 2 +- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 5b1c34e869..d757b76cda 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,19,4 - PRODUCTVERSION 0,10,19,4 + FILEVERSION 0,10,19,5 + PRODUCTVERSION 0,10,19,5 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.10.19.4" + VALUE "FileVersion", "0.10.19.5" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.10.19.4" + VALUE "ProductVersion", "0.10.19.5" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index a51fcdfcc4..abf93f304b 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,19,4 - PRODUCTVERSION 0,10,19,4 + FILEVERSION 0,10,19,5 + PRODUCTVERSION 0,10,19,5 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.10.19.4" + VALUE "FileVersion", "0.10.19.5" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.10.19.4" + VALUE "ProductVersion", "0.10.19.5" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 9b9bba03dc..169174315d 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "core/utils.h" -#define BETA_VERSION_MACRO (10019004ULL) +#define BETA_VERSION_MACRO (10019005ULL) constexpr int AppVersion = 10020; constexpr str_const AppVersionStr = "0.10.20"; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 9e03321562..cceba28e33 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -3274,8 +3274,13 @@ void HistoryWidget::onTextChange() { _send->hide(); updateMouseTracking(); mouseMoveEvent(0); - } else if (!_field->isHidden() && _send->isHidden()) { - _send->show(); + } else if (!_field->isHidden() && _send->isHidden() && (!_inlineBotCancel || _inlineBotCancel->isHidden())) { + if (_inlineBotCancel) { + _send->hide(); + _inlineBotCancel->show(); + } else { + _send->show(); + } updateMouseTracking(); _a_record.stop(); _inRecord = _inField = false; @@ -4717,7 +4722,7 @@ void HistoryWidget::updateControlsVisibility() { } 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); } @@ -5542,7 +5547,7 @@ void HistoryWidget::animStop() { void HistoryWidget::step_record(float64 ms, bool timer) { 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_recordDown.finish(); a_recordCancelActive.finish(); @@ -8748,7 +8753,7 @@ void HistoryWidget::paintEvent(QPaintEvent *e) { if (_list) { if (!_field->isHidden() || _recording) { drawField(p, r); - if (_send->isHidden()) { + if (_send->isHidden() && (!_inlineBotCancel || _inlineBotCancel->isHidden())) { drawRecordButton(p); if (_recording) drawRecording(p); } diff --git a/Telegram/build/version b/Telegram/build/version index eb7121d341..42cb9bf9dd 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 0.10 AppVersionStrSmall 0.10.20 AppVersionStr 0.10.20 AlphaChannel 0 -BetaVersion 10019004 +BetaVersion 10019005