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

Better opacity support for TextComponent

Browse source
This commit is contained in:
Aloshi 2013-10-10 16:14:33 -05:00
parent 2aad9cbdeb
commit e247326b51
4 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/GuiComponent.cpp
View file

@ -149,6 +149,10 @@ unsigned char GuiComponent::getOpacity() const
void GuiComponent::setOpacity(unsigned char opacity) void GuiComponent::setOpacity(unsigned char opacity)
{ {
mOpacity = opacity; mOpacity = opacity;
for(auto it = mChildren.begin(); it != mChildren.end(); it++)
{
(*it)->setOpacity(opacity);
}
} }
const Eigen::Affine3f GuiComponent::getTransform() const Eigen::Affine3f GuiComponent::getTransform()

4
src/GuiComponent.h
View file

@ -48,8 +48,8 @@ public:
unsigned int getChildCount() const; unsigned int getChildCount() const;
GuiComponent* getChild(unsigned int i) const; GuiComponent* getChild(unsigned int i) const;
unsigned char getOpacity() const; virtual unsigned char getOpacity() const;
void setOpacity(unsigned char opacity); virtual void setOpacity(unsigned char opacity);
const Eigen::Affine3f getTransform(); const Eigen::Affine3f getTransform();

28
src/components/TextComponent.cpp
View file

@ -32,8 +32,24 @@ void TextComponent::setFont(std::shared_ptr<Font> font)
void TextComponent::setColor(unsigned int color) void TextComponent::setColor(unsigned int color)
{ {
mColor = color; mColor = color;
mOpacity = mColor & 0x000000FF;
onTextChanged(); unsigned char opacity = mColor & 0x000000FF;
GuiComponent::setOpacity(opacity);
onColorChanged();
}
void TextComponent::setOpacity(unsigned char opacity)
{
mColor = (mColor & 0xFFFFFF00) | opacity;
onColorChanged();
GuiComponent::setOpacity(opacity);
}
unsigned char TextComponent::getOpacity() const
{
return mColor & 0x000000FF;
} }
void TextComponent::setText(const std::string& text) void TextComponent::setText(const std::string& text)
@ -104,6 +120,14 @@ void TextComponent::onTextChanged()
mTextCache = std::shared_ptr<TextCache>(f->buildTextCache(f->wrapText(mText, mSize.x()), 0, 0, (mColor >> 8 << 8) | mOpacity)); mTextCache = std::shared_ptr<TextCache>(f->buildTextCache(f->wrapText(mText, mSize.x()), 0, 0, (mColor >> 8 << 8) | mOpacity));
} }
void TextComponent::onColorChanged()
{
if(mTextCache)
{
mTextCache->setColor(mColor);
}
}
void TextComponent::setValue(const std::string& value) void TextComponent::setValue(const std::string& value)
{ {
setText(value); setText(value);

4
src/components/TextComponent.h
View file

@ -20,6 +20,9 @@ public:
std::string getValue() const override; std::string getValue() const override;
void setValue(const std::string& value) override; void setValue(const std::string& value) override;
unsigned char getOpacity() const override;
void setOpacity(unsigned char opacity) override;
std::shared_ptr<Font> getFont() const; std::shared_ptr<Font> getFont() const;
@ -27,6 +30,7 @@ private:
void calculateExtent(); void calculateExtent();
void onTextChanged(); void onTextChanged();
void onColorChanged();
unsigned int mColor; unsigned int mColor;
std::shared_ptr<Font> mFont; std::shared_ptr<Font> mFont;