procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Removed Notify::inlineKeyboardMoved as completely unused code.

Browse source
This commit is contained in:
23rd 2020-06-27 19:27:27 +03:00 committed by John Preston
parent b629e0c43a
commit 0227b5f2fa
11 changed files with 1 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Telegram/SourceFiles/facades.cpp
View file

@ -289,18 +289,6 @@ bool skipPaintEvent(QWidget *widget, QPaintEvent *event) {
namespace Notify {
void inlineKeyboardMoved(
not_null<const HistoryItem*> item,
int oldKeyboardTop,
int newKeyboardTop) {
if (const auto m = CheckMainWidget(&item->history()->session())) {
m->notify_inlineKeyboardMoved(
item,
oldKeyboardTop,
newKeyboardTop);
}
}
bool switchInlineBotButtonReceived(
not_null<Main::Session*> session,
const QString &query,

4
Telegram/SourceFiles/facades.h
View file

@ -76,10 +76,6 @@ enum ClipStopperType {
namespace Notify {
void inlineKeyboardMoved(
not_null<const HistoryItem*> item,
int oldKeyboardTop,
int newKeyboardTop);
bool switchInlineBotButtonReceived(
not_null<Main::Session*> session,
const QString &query,

15
Telegram/SourceFiles/history/history_inner_widget.cpp
View file

@ -2986,21 +2986,6 @@ void HistoryInner::notifyMigrateUpdated() {
_migrated = _history->migrateFrom();
}
int HistoryInner::moveScrollFollowingInlineKeyboard(
const HistoryItem *item,
int oldKeyboardTop,
int newKeyboardTop) {
if (const auto view = item ? item->mainView() : nullptr) {
if (view->isUnderCursor()) {
const auto top = itemTop(item);
if (top >= oldKeyboardTop) {
return newKeyboardTop - oldKeyboardTop;
}
}
}
return 0;
}
void HistoryInner::applyDragSelection() {
applyDragSelection(&_selected);
}

4
Telegram/SourceFiles/history/history_inner_widget.h
View file

@ -114,10 +114,6 @@ public:
void notifyIsBotChanged();
void notifyMigrateUpdated();
// When inline keyboard has moved because of the edition of its item we want
// to move scroll position so that mouse points to the same button row.
int moveScrollFollowingInlineKeyboard(const HistoryItem *item, int oldKeyboardTop, int newKeyboardTop);
// Ui::AbstractTooltipShower interface.
QString tooltipText() const override;
QPoint tooltipPos() const override;

1
Telegram/SourceFiles/history/history_item.cpp
View file

@ -206,6 +206,7 @@ void HistoryItem::finishEdition(int oldKeyboardTop) {
}
}
// Should be completely redesigned as the oldTop no longer exists.
//if (oldKeyboardTop >= 0) { // #TODO edit bot message
// if (auto keyboard = Get<HistoryMessageReplyMarkup>()) {
// keyboard->oldTop = oldKeyboardTop;

3
Telegram/SourceFiles/history/history_item_components.h
View file

@ -213,9 +213,6 @@ struct HistoryMessageReplyMarkup : public RuntimeComponent<HistoryMessageReplyMa
std::unique_ptr<ReplyKeyboard> inlineKeyboard;
// If >= 0 it holds the y coord of the inlineKeyboard before the last edition.
int oldTop = -1;
private:
void createFromButtonRows(const QVector<MTPKeyboardButtonRow> &v);

8
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -1524,14 +1524,6 @@ void HistoryWidget::onRecordUpdate(quint16 level, qint32 samples) {
}
}
void HistoryWidget::notify_inlineKeyboardMoved(not_null<const HistoryItem*> item, int oldKeyboardTop, int newKeyboardTop) {
if (_history == item->history() || _migrated == item->history()) {
if (const auto move = _list->moveScrollFollowingInlineKeyboard(item, oldKeyboardTop, newKeyboardTop)) {
_addToScroll = move;
}
}
}
bool HistoryWidget::notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo) {
if (samePeerBot) {
if (_history) {

1
Telegram/SourceFiles/history/history_widget.h
View file

@ -275,7 +275,6 @@ public:
PeerData *ui_getPeerForMouseAction();
void notify_inlineKeyboardMoved(not_null<const HistoryItem*> item, int oldKeyboardTop, int newKeyboardTop);
bool notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo);
~HistoryWidget();

14
Telegram/SourceFiles/history/view/history_view_message.cpp
View file

@ -1957,20 +1957,6 @@ QSize Message::performCountCurrentSize(int newWidth) {
const auto item = message();
const auto newHeight = resizeContentGetHeight(newWidth);
const auto keyboard = item->inlineReplyKeyboard();
if (const auto markup = item->Get<HistoryMessageReplyMarkup>()) {
const auto oldTop = markup->oldTop;
if (oldTop >= 0) {
markup->oldTop = -1;
if (keyboard) {
const auto height = st::msgBotKbButton.margin + keyboard->naturalHeight();
const auto keyboardTop = newHeight - height + st::msgBotKbButton.margin - marginBottom();
if (keyboardTop != oldTop) {
Notify::inlineKeyboardMoved(item, oldTop, keyboardTop);
}
}
}
}
return { newWidth, newHeight };
}

4
Telegram/SourceFiles/mainwidget.cpp
View file

@ -604,10 +604,6 @@ void MainWidget::onFilesOrForwardDrop(
}
}
void MainWidget::notify_inlineKeyboardMoved(not_null<const HistoryItem*> item, int oldKeyboardTop, int newKeyboardTop) {
_history->notify_inlineKeyboardMoved(item, oldKeyboardTop, newKeyboardTop);
}
bool MainWidget::notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo) {
return _history->notify_switchInlineBotButtonReceived(query, samePeerBot, samePeerReplyTo);
}

1
Telegram/SourceFiles/mainwidget.h
View file

@ -230,7 +230,6 @@ public:
MsgId msgId);
PeerData *ui_getPeerForMouseAction();
void notify_inlineKeyboardMoved(not_null<const HistoryItem*> item, int oldKeyboardTop, int newKeyboardTop);
bool notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo);
using FloatDelegate::floatPlayerAreaUpdated;