procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix emoji suggestions in monospace.

This commit is contained in:
John Preston 2019-01-21 11:02:20 +04:00
parent 805e4d01e7
commit 6066265717
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/ui/widgets/input_fields.cpp
View File

@ -2895,14 +2895,22 @@ void InputField::applyInstantReplace(
} else if (position < length) { } else if (position < length) {
return; return;
} }
commitInstantReplacement(position - length, position, with, what); commitInstantReplacement(position - length, position, with, what, true);
}
void InputField::commitInstantReplacement(
int from,
int till,
const QString &with) {
commitInstantReplacement(from, till, with, std::nullopt, false);
} }
void InputField::commitInstantReplacement( void InputField::commitInstantReplacement(
int from, int from,
int till, int till,
const QString &with, const QString &with,
std::optional<QString> checkOriginal) { std::optional<QString> checkOriginal,
bool checkIfInMonospace) {
const auto original = getTextWithTagsPart(from, till).text; const auto original = getTextWithTagsPart(from, till).text;
if (checkOriginal if (checkOriginal
&& checkOriginal->compare(original, Qt::CaseInsensitive) != 0) { && checkOriginal->compare(original, Qt::CaseInsensitive) != 0) {
@ -2910,9 +2918,11 @@ void InputField::commitInstantReplacement(
} }
auto cursor = textCursor(); auto cursor = textCursor();
const auto currentTag = cursor.charFormat().property(kTagProperty); if (checkIfInMonospace) {
if (currentTag == kTagPre || currentTag == kTagCode) { const auto currentTag = cursor.charFormat().property(kTagProperty);
return; if (currentTag == kTagPre || currentTag == kTagCode) {
return;
}
} }
cursor.setPosition(from); cursor.setPosition(from);
cursor.setPosition(till, QTextCursor::KeepAnchor); cursor.setPosition(till, QTextCursor::KeepAnchor);

27
Telegram/SourceFiles/ui/widgets/input_fields.h
View File

@ -225,22 +225,11 @@ public:
void setInstantReplaces(const InstantReplaces &replaces); void setInstantReplaces(const InstantReplaces &replaces);
void setInstantReplacesEnabled(rpl::producer<bool> enabled); void setInstantReplacesEnabled(rpl::producer<bool> enabled);
void setMarkdownReplacesEnabled(rpl::producer<bool> enabled); void setMarkdownReplacesEnabled(rpl::producer<bool> enabled);
void commitInstantReplacement( void commitInstantReplacement(int from, int till, const QString &with);
int from,
int till,
const QString &with,
std::optional<QString> checkOriginal = std::nullopt);
bool commitMarkdownReplacement(
int from,
int till,
const QString &tag,
const QString &edge = QString());
void commitMarkdownLinkEdit( void commitMarkdownLinkEdit(
EditLinkSelection selection, EditLinkSelection selection,
const QString &text, const QString &text,
const QString &link); const QString &link);
void toggleSelectionMarkdown(const QString &tag);
void clearSelectionMarkdown();
static bool IsValidMarkdownLink(const QString &link); static bool IsValidMarkdownLink(const QString &link);
const QString &getLastText() const { const QString &getLastText() const {
@ -408,6 +397,20 @@ private:
EditLinkSelection editLinkSelection(QContextMenuEvent *e) const; EditLinkSelection editLinkSelection(QContextMenuEvent *e) const;
void editMarkdownLink(EditLinkSelection selection); void editMarkdownLink(EditLinkSelection selection);
void commitInstantReplacement(
int from,
int till,
const QString &with,
std::optional<QString> checkOriginal,
bool checkIfInMonospace);
bool commitMarkdownReplacement(
int from,
int till,
const QString &tag,
const QString &edge = QString());
void toggleSelectionMarkdown(const QString &tag);
void clearSelectionMarkdown();
bool revertFormatReplace(); bool revertFormatReplace();
void highlightMarkdown(); void highlightMarkdown();