mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-03 08:05:12 +00:00
Code Issues Releases Wiki Activity

Move some settings from global to Session.

Browse Source
This commit is contained in:
John Preston
2019-08-02 11:40:35 +01:00
parent 7e4c9f98a6
commit 93a52bb66e
30 changed files with 315 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Telegram/SourceFiles/chat_helpers/message_field.cpp
View File

@@ -63,6 +63,7 @@ class EditLinkBox : public BoxContent {
public:
EditLinkBox(
QWidget*,
not_null<Main::Session*> session,
const QString &text,
const QString &link,
Fn<void(QString, QString)> callback);
@@ -73,6 +74,7 @@ protected:
void prepare() override;
private:
const not_null<Main::Session*> _session;
QString _startText;
QString _startLink;
Fn<void(QString, QString)> _callback;
@@ -92,10 +94,12 @@ private:
EditLinkBox::EditLinkBox(
QWidget*,
not_null<Main::Session*> session,
const QString &text,
const QString &link,
Fn<void(QString, QString)> callback)
: _startText(text)
: _session(session)
, _startText(text)
, _startLink(link)
, _callback(std::move(callback)) {
Expects(_callback != nullptr);
@@ -118,10 +122,12 @@ void EditLinkBox::prepare() {
_startText),
st::markdownLinkFieldPadding);
text->setInstantReplaces(Ui::InstantReplaces::Default());
text->setInstantReplacesEnabled(Global::ReplaceEmojiValue());
text->setInstantReplacesEnabled(
_session->settings().replaceEmojiValue());
Ui::Emoji::SuggestionsController::Init(
getDelegate()->outerContainer(),
text);
text,
_session);
const auto url = content->add(
object_ptr<Ui::InputField>(
@@ -340,6 +346,7 @@ Fn<bool(
QString text,
QString link,
EditLinkAction action)> DefaultEditLinkCallback(
not_null<Main::Session*> session,
not_null<Ui::InputField*> field) {
const auto weak = make_weak(field);
return [=](
@@ -351,7 +358,7 @@ Fn<bool(
return Ui::InputField::IsValidMarkdownLink(link)
&& !IsMentionLink(link);
}
Ui::show(Box<EditLinkBox>(text, link, [=](
Ui::show(Box<EditLinkBox>(session, text, link, [=](
const QString &text,
const QString &link) {
if (const auto strong = weak.data()) {
@@ -375,9 +382,11 @@ void InitMessageField(
field->customTab(true);
field->setInstantReplaces(Ui::InstantReplaces::Default());
field->setInstantReplacesEnabled(Global::ReplaceEmojiValue());
field->setInstantReplacesEnabled(
controller->session().settings().replaceEmojiValue());
field->setMarkdownReplacesEnabled(rpl::single(true));
field->setEditLinkCallback(DefaultEditLinkCallback(field));
field->setEditLinkCallback(
DefaultEditLinkCallback(&controller->session(), field));
}
bool HasSendText(not_null<const Ui::InputField*> field) {