awesome-bookmarks/tdesktop-dpi-fix-patch-example
3
0
Fork 0
mirror of https://github.com/Qz3rK/tdesktop.git synced 2026-07-03 14:15:08 +02:00
Code Issues Packages 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
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/core/version.h
+1 -1
View File
@@ -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";
Telegram/SourceFiles/historywidget.cpp
+10 -5
View File
@@ -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);
}