Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added margin support to TextComponent for abbreviated text.

Browse source
This commit is contained in:
Leon Styhre 2021-01-05 16:52:39 +01:00
parent dc9c49438f
commit 8ecc50b4ce
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@ TextComponent::TextComponent(
mVerticalAlignment(ALIGN_CENTER), mVerticalAlignment(ALIGN_CENTER),
mLineSpacing(1.5f), mLineSpacing(1.5f),
mBgColor(0), mBgColor(0),
mMargin(0.0f),
mRenderBackground(false) mRenderBackground(false)
{ {
} }
@ -35,7 +36,8 @@ TextComponent::TextComponent(
Alignment align, Alignment align,
Vector3f pos, Vector3f pos,
Vector2f size, Vector2f size,
unsigned int bgcolor) unsigned int bgcolor,
float margin)
: GuiComponent(window), : GuiComponent(window),
mFont(nullptr), mFont(nullptr),
mUppercase(false), mUppercase(false),
@ -45,6 +47,7 @@ TextComponent::TextComponent(
mVerticalAlignment(ALIGN_CENTER), mVerticalAlignment(ALIGN_CENTER),
mLineSpacing(1.5f), mLineSpacing(1.5f),
mBgColor(0), mBgColor(0),
mMargin(margin),
mRenderBackground(false) mRenderBackground(false)
{ {
setFont(font); setFont(font);
@ -230,8 +233,10 @@ void TextComponent::onTextChanged()
// Abbreviate text. // Abbreviate text.
const std::string abbrev = "..."; const std::string abbrev = "...";
Vector2f abbrevSize = f->sizeText(abbrev); Vector2f abbrevSize = f->sizeText(abbrev);
// mMargin adds a margin around the text if it's abbreviated.
float marginAdjustedSize = mSize.x() - (mSize.x() * mMargin);
while (text.size() && size.x() + abbrevSize.x() > mSize.x()) { while (text.size() && size.x() + abbrevSize.x() > marginAdjustedSize) {
size_t newSize = Utils::String::prevCursor(text, text.size()); size_t newSize = Utils::String::prevCursor(text, text.size());
text.erase(newSize, text.size() - newSize); text.erase(newSize, text.size() - newSize);
size = f->sizeText(text); size = f->sizeText(text);

4
es-core/src/components/TextComponent.h
View file

@ -33,7 +33,8 @@ public:
Alignment align = ALIGN_LEFT, Alignment align = ALIGN_LEFT,
Vector3f pos = Vector3f::Zero(), Vector3f pos = Vector3f::Zero(),
Vector2f size = Vector2f::Zero(), Vector2f size = Vector2f::Zero(),
unsigned int bgcolor = 0x00000000); unsigned int bgcolor = 0x00000000,
float margin = 0.0f);
void setFont(const std::shared_ptr<Font>& font); void setFont(const std::shared_ptr<Font>& font);
void setUppercase(bool uppercase); void setUppercase(bool uppercase);
@ -80,6 +81,7 @@ private:
unsigned int mBgColor; unsigned int mBgColor;
unsigned char mColorOpacity; unsigned char mColorOpacity;
unsigned char mBgColorOpacity; unsigned char mBgColorOpacity;
float mMargin;
bool mRenderBackground; bool mRenderBackground;
bool mUppercase; bool mUppercase;