PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: image render & LabelCache::update crash

Browse Source
This commit is contained in:
@clasher113 2025-03-29 21:53:05 +02:00
parent 06adaaeadc
commit a6015a326b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/ui/elements/Label.cpp
View File

@ -51,7 +51,7 @@ void LabelCache::update(std::wstring_view text, bool multiline, bool wrap) {
if (text[i] == L'\n') { if (text[i] == L'\n') {
lines.push_back(LineScheme {i+1, false}); lines.push_back(LineScheme {i+1, false});
len = 0; len = 0;
} else if (i > 0 && wrap && text[i+1] != L'\n') { } else if (i > 0 && i+1 < text.length() && wrap && text[i+1] != L'\n') {
size_t width = font->calcWidth(text, i-len-1, i-(i-len)+2); size_t width = font->calcWidth(text, i-len-1, i-(i-len)+2);
if (width >= wrapWidth) { if (width >= wrapWidth) {
// starting a fake line // starting a fake line

4
src/graphics/ui/elements/UINode.cpp
View File

@ -160,9 +160,9 @@ CursorShape UINode::getCursor() const {
glm::vec2 UINode::calcPos() const { glm::vec2 UINode::calcPos() const {
if (parent) { if (parent) {
return pos + parent->calcPos() + parent->getContentOffset(); return glm::ivec2(pos + parent->calcPos() + parent->getContentOffset());
} }
return pos; return glm::ivec2(pos);
} }
void UINode::scrolled(int value) { void UINode::scrolled(int value) {