kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Fixed drawing spoiler when it ends with formatted text and space.

Browse source
This commit is contained in:
23rd 2022-01-24 23:12:45 +03:00
parent 274200039c
commit 5acbd74670
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ui/text/text.cpp
View file

@ -1811,20 +1811,6 @@ private:
const auto elideOffset = (_indexOfElidedBlock == currentBlockIndex) const auto elideOffset = (_indexOfElidedBlock == currentBlockIndex)
? (_elideRemoveFromEnd + _f->elidew) ? (_elideRemoveFromEnd + _f->elidew)
: 0; : 0;
const auto &cache = _background.inFront
? _t->_spoilerCache
: _t->_spoilerShownCache;
const auto cornerWidth = cache.corners[0].width()
/ style::DevicePixelRatio();
const auto useWidth = (x + width).toInt() - x.toInt();
const auto rect = QRect(
x.toInt(),
_y + _yDelta,
std::max(useWidth - elideOffset, cornerWidth * 2),
_fontHeight);
if (!rect.isValid()) {
return;
}
const auto parts = [&] { const auto parts = [&] {
const auto blockIndex = currentBlockIndex - 1; const auto blockIndex = currentBlockIndex - 1;
@ -1850,6 +1836,26 @@ private:
| ((now != was) ? (RectPart::FullLeft) : RectPart::None) | ((now != was) ? (RectPart::FullLeft) : RectPart::None)
| ((now != will) ? (RectPart::FullRight) : RectPart::None); | ((now != will) ? (RectPart::FullRight) : RectPart::None);
}(); }();
const auto hasLeft = (parts & RectPart::Left) != 0;
const auto hasRight = (parts & RectPart::Right) != 0;
const auto &cache = _background.inFront
? _t->_spoilerCache
: _t->_spoilerShownCache;
const auto cornerWidth = cache.corners[0].width()
/ style::DevicePixelRatio();
const auto useWidth = ((x + width).toInt() - x.toInt()) - elideOffset;
const auto minWidth = cornerWidth * 2;
const auto rect = QRect(
x.toInt(),
_y + _yDelta,
std::max(
useWidth,
(hasRight ? cornerWidth : 0) + (hasLeft ? cornerWidth : 0)),
_fontHeight);
if (!rect.isValid()) {
return;
}
if (parts != RectPart::None) { if (parts != RectPart::None) {
DrawRoundedRect( DrawRoundedRect(
@ -1859,8 +1865,6 @@ private:
cache.corners, cache.corners,
parts); parts);
} }
const auto hasLeft = (parts & RectPart::Left) != 0;
const auto hasRight = (parts & RectPart::Right) != 0;
_p->fillRect( _p->fillRect(
rect.left() + (hasLeft ? cornerWidth : 0), rect.left() + (hasLeft ? cornerWidth : 0),
rect.top(), rect.top(),