void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "For testing insert stickers as custom emoji."

Browse source 
This reverts commit 17095983c546326223cd8eb69453f7f4c7dd8e78.
This commit is contained in:
John Preston 2022-07-08 17:20:15 +04:00
parent 4127b68675
commit 248e0d502c
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -167,8 +167,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <QtCore/QMimeData> #include <QtCore/QMimeData>
#include "data/stickers/data_custom_emoji.h"
const char kOptionAutoScrollInactiveChat[] = const char kOptionAutoScrollInactiveChat[] =
"auto-scroll-inactive-chat"; "auto-scroll-inactive-chat";
@ -426,14 +424,10 @@ HistoryWidget::HistoryWidget(
_fieldAutocomplete->stickerChosen( _fieldAutocomplete->stickerChosen(
) | rpl::start_with_next([=](FieldAutocomplete::StickerChosen data) { ) | rpl::start_with_next([=](FieldAutocomplete::StickerChosen data) {
Data::InsertCustomEmoji(_field.data(), data.sticker);
AssertIsDebug();
#if 0
controller->sendingAnimation().appendSending( controller->sendingAnimation().appendSending(
data.messageSendingFrom); data.messageSendingFrom);
const auto localId = data.messageSendingFrom.localId; const auto localId = data.messageSendingFrom.localId;
sendExistingDocument(data.sticker, data.options, localId); sendExistingDocument(data.sticker, data.options, localId);
#endif
}, lifetime()); }, lifetime());
_fieldAutocomplete->setModerateKeyActivateCallback([=](int key) { _fieldAutocomplete->setModerateKeyActivateCallback([=](int key) {
@ -1059,16 +1053,12 @@ void HistoryWidget::initTabbedSelector() {
selector->fileChosen( selector->fileChosen(
) | filter | rpl::start_with_next([=](Selector::FileChosen data) { ) | filter | rpl::start_with_next([=](Selector::FileChosen data) {
Data::InsertCustomEmoji(_field.data(), data.document);
AssertIsDebug();
#if 0
controller()->sendingAnimation().appendSending( controller()->sendingAnimation().appendSending(
data.messageSendingFrom); data.messageSendingFrom);
sendExistingDocument( sendExistingDocument(
data.document, data.document,
data.options, data.options,
data.messageSendingFrom.localId); data.messageSendingFrom.localId);
#endif
}, lifetime()); }, lifetime());
selector->photoChosen( selector->photoChosen(

12
Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
View file

@ -60,8 +60,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "data/stickers/data_custom_emoji.h"
namespace HistoryView { namespace HistoryView {
namespace { namespace {
@ -1487,9 +1485,6 @@ void ComposeControls::initAutocomplete() {
_autocomplete->stickerChosen( _autocomplete->stickerChosen(
) | rpl::start_with_next([=](FieldAutocomplete::StickerChosen data) { ) | rpl::start_with_next([=](FieldAutocomplete::StickerChosen data) {
Data::InsertCustomEmoji(_field, data.sticker);
AssertIsDebug();
#if 0
if (!_showSlowmodeError || !_showSlowmodeError()) { if (!_showSlowmodeError || !_showSlowmodeError()) {
setText({}); setText({});
} }
@ -1502,7 +1497,6 @@ void ComposeControls::initAutocomplete() {
.options = data.options, .options = data.options,
.messageSendingFrom = base::take(data.messageSendingFrom), .messageSendingFrom = base::take(data.messageSendingFrom),
}); });
#endif
}, _autocomplete->lifetime()); }, _autocomplete->lifetime());
_autocomplete->choosingProcesses( _autocomplete->choosingProcesses(
@ -1835,13 +1829,7 @@ void ComposeControls::initTabbedSelector() {
}, wrap->lifetime()); }, wrap->lifetime());
selector->fileChosen( selector->fileChosen(
) | rpl::start_with_next([=](const FileChosen &data) {
Data::InsertCustomEmoji(_field, data.document);
AssertIsDebug();
}, wrap->lifetime());
#if 0
) | rpl::start_to_stream(_fileChosen, wrap->lifetime()); ) | rpl::start_to_stream(_fileChosen, wrap->lifetime());
#endif
selector->photoChosen( selector->photoChosen(
) | rpl::start_to_stream(_photoChosen, wrap->lifetime()); ) | rpl::start_to_stream(_photoChosen, wrap->lifetime());