kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Some fixes in spoiler geometry.

Browse source
This commit is contained in:
John Preston 2021-12-30 15:19:45 +03:00
parent 8b0ff16b66
commit 5f94fa24a0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ui/text/text.cpp
View file

@ -1767,7 +1767,7 @@ private:
} }
if (_background.color) { if (_background.color) {
const auto from = currentBlock->from(); const auto from = currentBlock->from();
const auto to = currentBlock->from() + currentBlock->width(); const auto to = (nextBlock ? nextBlock->from() : _t->_text.size());
if (_localFrom + si.position < to) { if (_localFrom + si.position < to) {
auto chFrom = _str + currentBlock->from(); auto chFrom = _str + currentBlock->from();
auto chTo = chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from()); auto chTo = chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
@ -1781,7 +1781,7 @@ private:
if (rtl) { // rtl space only if (rtl) { // rtl space only
fillSpoiler = { x, glyphX - x }; fillSpoiler = { x, glyphX - x };
} else { // ltr space only } else { // ltr space only
fillSpoiler = { x + currentBlock->f_width(), si.width }; fillSpoiler = { x + currentBlock->f_width(), si.width - currentBlock->f_width() };
} }
} }
} }
@ -1995,7 +1995,7 @@ private:
if (fillOpacity != opacity) { if (fillOpacity != opacity) {
_p->setOpacity(fillOpacity); _p->setOpacity(fillOpacity);
} }
fillSpoilerRange(x, si.width, blockIndex); fillSpoilerRange(x, itemWidth, blockIndex);
_p->setOpacity(opacity); _p->setOpacity(opacity);
} }
} }