Update lib_ui.

This commit is contained in:
John Preston 2020-06-04 10:53:59 +04:00
parent 9d1a4cdbfe
commit c868cd6036
4 changed files with 11 additions and 8 deletions

View file

@ -38,6 +38,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace { namespace {
using namespace Ui::Text;
using EditLinkAction = Ui::InputField::EditLinkAction; using EditLinkAction = Ui::InputField::EditLinkAction;
using EditLinkSelection = Ui::InputField::EditLinkSelection; using EditLinkSelection = Ui::InputField::EditLinkSelection;
@ -298,7 +300,7 @@ bool HasSendText(not_null<const Ui::InputField*> field) {
if (code != ' ' if (code != ' '
&& code != '\n' && code != '\n'
&& code != '\r' && code != '\r'
&& !chReplacedBySpace(code)) { && !IsReplacedBySpace(code)) {
return true; return true;
} }
} }
@ -585,13 +587,14 @@ void MessageLinksParser::parse() {
const QChar *domainEnd = start + m.capturedEnd(), *p = domainEnd; const QChar *domainEnd = start + m.capturedEnd(), *p = domainEnd;
for (; p < end; ++p) { for (; p < end; ++p) {
QChar ch(*p); QChar ch(*p);
if (chIsLinkEnd(ch)) break; // link finished if (IsLinkEnd(ch)) {
if (chIsAlmostLinkEnd(ch)) { break; // link finished
} else if (IsAlmostLinkEnd(ch)) {
const QChar *endTest = p + 1; const QChar *endTest = p + 1;
while (endTest < end && chIsAlmostLinkEnd(*endTest)) { while (endTest < end && IsAlmostLinkEnd(*endTest)) {
++endTest; ++endTest;
} }
if (endTest >= end || chIsLinkEnd(*endTest)) { if (endTest >= end || IsLinkEnd(*endTest)) {
break; // link finished at p break; // link finished at p
} }
p = endTest; p = endTest;

View file

@ -267,7 +267,7 @@ void EmptyUserpic::fillString(const QString &name) {
} }
} else if (!letterFound && ch->isLetterOrNumber()) { } else if (!letterFound && ch->isLetterOrNumber()) {
letterFound = true; letterFound = true;
if (ch + 1 != end && chIsDiac(*(ch + 1))) { if (ch + 1 != end && Ui::Text::IsDiac(*(ch + 1))) {
letters.push_back(QString(ch, 2)); letters.push_back(QString(ch, 2));
levels.push_back(level); levels.push_back(level);
++ch; ++ch;

View file

@ -41,7 +41,7 @@ QString fillLetters(const QString &name) {
} }
} else if (!letterFound && ch->isLetterOrNumber()) { } else if (!letterFound && ch->isLetterOrNumber()) {
letterFound = true; letterFound = true;
if (ch + 1 != end && chIsDiac(*(ch + 1))) { if (ch + 1 != end && Ui::Text::IsDiac(*(ch + 1))) {
letters.push_back(QString(ch, 2)); letters.push_back(QString(ch, 2));
levels.push_back(level); levels.push_back(level);
++ch; ++ch;

@ -1 +1 @@
Subproject commit 62feafef7ebba8df227904759f7f5684f35cb4d3 Subproject commit d71d2121b1ffc10d2c5565d911bfa31a505d343a