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

Fix palette update in InputField. 

Fixes #4774.
This commit is contained in:
John Preston 2018-06-03 21:57:52 +03:00
parent b64bbc7708
commit b4a2e84aa3
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1125,9 +1125,6 @@ InputField::InputField(
_inner->setFont(_st.font->f); _inner->setFont(_st.font->f);
_inner->setAlignment(_st.textAlign); _inner->setAlignment(_st.textAlign);
_defaultCharFormat = _inner->textCursor().charFormat();
_defaultCharFormat.merge(PrepareTagFormat(_st, QString()));
_inner->textCursor().setCharFormat(_defaultCharFormat);
if (_mode == Mode::SingleLine) { if (_mode == Mode::SingleLine) {
_inner->setWordWrapMode(QTextOption::NoWrap); _inner->setWordWrapMode(QTextOption::NoWrap);
} }
@ -1141,7 +1138,10 @@ InputField::InputField(
updatePalette(); updatePalette();
} }
}); });
_defaultCharFormat = _inner->textCursor().charFormat();
updatePalette(); updatePalette();
_inner->textCursor().setCharFormat(_defaultCharFormat);
_inner->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); _inner->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
_inner->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); _inner->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@ -1218,6 +1218,34 @@ void InputField::updatePalette() {
auto p = _inner->palette(); auto p = _inner->palette();
p.setColor(QPalette::Text, _st.textFg->c); p.setColor(QPalette::Text, _st.textFg->c);
_inner->setPalette(p); _inner->setPalette(p);
_defaultCharFormat.merge(PrepareTagFormat(_st, QString()));
auto cursor = textCursor();
const auto document = _inner->document();
auto block = document->begin();
const auto end = document->end();
for (; block != end; block = block.next()) {
auto till = block.position();
for (auto i = block.begin(); !i.atEnd();) {
for (; !i.atEnd(); ++i) {
const auto fragment = i.fragment();
if (!fragment.isValid() || fragment.position() < till) {
continue;
}
till = fragment.position() + fragment.length();
auto format = fragment.charFormat();
const auto tag = format.property(kTagProperty).toString();
format.setForeground(PrepareTagFormat(_st, tag).foreground());
cursor.setPosition(fragment.position());
cursor.setPosition(till, QTextCursor::KeepAnchor);
cursor.mergeCharFormat(format);
i = block.begin();
break;
}
}
}
} }
void InputField::onTouchTimer() { void InputField::onTouchTimer() {