Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enabled vertical abbreviations of multiline text entries in TextComponent.

Browse source 
Also fixed an issue where the debug overlay would not get rendered correctly for scrollable containers.
This commit is contained in:
Leon Styhre 2022-08-21 16:51:21 +02:00
parent ce217c48a4
commit 08d5e4eff0
4 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
es-core/src/GuiComponent.h
View file

@ -253,6 +253,7 @@ public:
// Used to set the parameters for ScrollableContainer.
virtual void setScrollParameters(float, float, float) {}
virtual const bool isScrollable() const { return false; }
virtual void onFocusGained() {}
virtual void onFocusLost() {}

3
es-core/src/components/ScrollableContainer.cpp
View file

@ -239,6 +239,9 @@ void ScrollableContainer::render(const glm::mat4& parentTrans)
trans = glm::translate(trans, -glm::vec3 {mScrollPos.x, mScrollPos.y, 0.0f});
mRenderer->setMatrix(trans);
if (Settings::getInstance()->getBool("DebugText"))
mRenderer->drawRect(0.0f, mScrollPos.y, mSize.x, mSize.y, 0x0000FF33, 0x0000FF33);
GuiComponent::renderChildren(trans);
mRenderer->popClipRect();
}

2
es-core/src/components/ScrollableContainer.h
View file

@ -28,6 +28,8 @@ public:
glm::vec2 getScrollPos() const { return mScrollPos; }
void setScrollPos(const glm::vec2& pos) { mScrollPos = pos; }
const bool isScrollable() const override { return true; }
void setAutoScroll(bool autoScroll);
void setScrollParameters(float autoScrollDelayConstant,
float autoScrollResetDelayConstant,

40
es-core/src/components/TextComponent.cpp
View file

@ -159,7 +159,7 @@ void TextComponent::setCapitalize(bool capitalize)
void TextComponent::render(const glm::mat4& parentTrans)
{
if (!isVisible() || mThemeOpacity == 0.0f)
if (!isVisible() || mThemeOpacity == 0.0f || mSize.x == 0.0f || mSize.y == 0.0f)
return;
glm::mat4 trans {parentTrans * getTransform()};
@ -197,9 +197,12 @@ void TextComponent::render(const glm::mat4& parentTrans)
yOff = (getSize().y - textSize.y) / 2.0f;
}
// Draw the "textbox" area, what we are aligned within.
if (Settings::getInstance()->getBool("DebugText"))
mRenderer->drawRect(0.0f, 0.0f, mSize.x, mSize.y, 0x0000FF33, 0x0000FF33);
// Draw the overall textbox area. If we're inside a scrollable container then this
// area is rendered inside that component instead of here.
if (Settings::getInstance()->getBool("DebugText")) {
if (!mParent || !mParent->isScrollable())
mRenderer->drawRect(0.0f, 0.0f, mSize.x, mSize.y, 0x0000FF33, 0x0000FF33);
}
trans = glm::translate(trans, glm::vec3 {0.0f, std::round(yOff), 0.0f});
@ -279,7 +282,7 @@ void TextComponent::onTextChanged()
{
calculateExtent();
if (!mFont || mText.empty()) {
if (!mFont || mText.empty() || mSize.x == 0.0f || mSize.y == 0.0f) {
mTextCache.reset();
return;
}
@ -295,25 +298,27 @@ void TextComponent::onTextChanged()
else
text = mText; // Original case.
std::shared_ptr<Font> f = mFont;
const bool isMultiline = (mSize.y == 0.0f || mSize.y > f->getHeight() * 1.2f);
std::shared_ptr<Font> f {mFont};
const float lineHeight {f->getHeight(mLineSpacing)};
const bool isMultiline {mSize.y > lineHeight};
const bool isScrollable {mParent && mParent->isScrollable()};
bool addAbbrev = false;
bool addAbbrev {false};
if (!isMultiline) {
size_t newline = text.find('\n');
size_t newline {text.find('\n')};
// Single line of text - stop at the first newline since it'll mess everything up.
text = text.substr(0, newline);
addAbbrev = newline != std::string::npos;
}
glm::vec2 size {f->sizeText(text)};
if (!isMultiline && mSize.x > 0.0f && text.size() && (size.x > mSize.x || addAbbrev)) {
if (!isMultiline && text.size() && (size.x > mSize.x || addAbbrev)) {
// Abbreviate text.
const std::string abbrev = "...";
glm::vec2 abbrevSize {f->sizeText(abbrev)};
const std::string abbrev {"..."};
float abbrevSize {f->sizeText(abbrev).x};
while (text.size() && size.x + abbrevSize.x > mSize.x) {
size_t newSize = Utils::String::prevCursor(text, text.size());
while (text.size() && size.x + abbrevSize > mSize.x) {
size_t newSize {Utils::String::prevCursor(text, text.size())};
text.erase(newSize, text.size() - newSize);
if (!text.empty() && text.back() == ' ')
text.pop_back();
@ -324,6 +329,13 @@ void TextComponent::onTextChanged()
mTextCache = std::shared_ptr<TextCache>(f->buildTextCache(
text, glm::vec2 {}, mColor, mSize.x, mHorizontalAlignment, mLineSpacing, mNoTopMargin));
}
else if (isMultiline && text.size() && !isScrollable) {
const std::string wrappedText {
f->wrapText(text, mSize.x, mSize.y - lineHeight, mLineSpacing)};
mTextCache = std::shared_ptr<TextCache>(f->buildTextCache(wrappedText, glm::vec2 {}, mColor,
mSize.x, mHorizontalAlignment,
mLineSpacing, mNoTopMargin));
}
else {
mTextCache = std::shared_ptr<TextCache>(
f->buildTextCache(f->wrapText(text, mSize.x), glm::vec2 {}, mColor, mSize.x,