kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Fix possible crash in new Text geometries.

Browse source
This commit is contained in:
John Preston 2023-10-05 13:00:30 +04:00
parent 3698eb5382
commit 68b89a6ba9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ui/text/text.cpp
View file

@ -682,7 +682,9 @@ void String::drawElided(Painter &p, int32 left, int32 top, int32 w, int32 lines,
.palette = &p.textPalette(), .palette = &p.textPalette(),
.paused = p.inactive(), .paused = p.inactive(),
.selection = selection, .selection = selection,
.elisionHeight = (lines > 1) ? (lines * _st->font->height) : 0, .elisionHeight = ((!isEmpty() && lines > 1)
? (lines * _st->font->height)
: 0),
.elisionRemoveFromEnd = removeFromEnd, .elisionRemoveFromEnd = removeFromEnd,
.elisionOneLine = (lines == 1), .elisionOneLine = (lines == 1),
}); });
@ -716,6 +718,9 @@ void String::drawRightElided(Painter &p, int32 right, int32 top, int32 width, in
} }
StateResult String::getState(QPoint point, int width, StateRequest request) const { StateResult String::getState(QPoint point, int width, StateRequest request) const {
if (isEmpty()) {
return {};
}
return Renderer(*this).getState( return Renderer(*this).getState(
point, point,
SimpleGeometry(width, _st->font->height, 0, 0, false, false), SimpleGeometry(width, _st->font->height, 0, 0, false, false),
@ -727,6 +732,9 @@ StateResult String::getStateLeft(QPoint point, int width, int outerw, StateReque
} }
StateResult String::getStateElided(QPoint point, int width, StateRequestElided request) const { StateResult String::getStateElided(QPoint point, int width, StateRequestElided request) const {
if (isEmpty()) {
return {};
}
return Renderer(*this).getState(point, SimpleGeometry( return Renderer(*this).getState(point, SimpleGeometry(
width, width,
_st->font->height, _st->font->height,