mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-26 08:05:38 +00:00
Moved Opacity logic to GuiComponent
Moved Opacity logic from ImageComponent to GuiComponent so any extender of GuiComponent che implement its opacity logic. Implemented Opacity logic for TextComponent (now text can have fade animation)
This commit is contained in:
parent
e785a2dfe0
commit
b4e554153a
|
@ -156,3 +156,14 @@ GuiComponent* GuiComponent::getParent()
|
||||||
{
|
{
|
||||||
return mParent;
|
return mParent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
unsigned char GuiComponent::getOpacity()
|
||||||
|
{
|
||||||
|
return mOpacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
void GuiComponent::setOpacity(unsigned char opacity)
|
||||||
|
{
|
||||||
|
mOpacity = opacity;
|
||||||
|
}
|
|
@ -45,11 +45,14 @@ public:
|
||||||
void clearChildren();
|
void clearChildren();
|
||||||
unsigned int getChildCount();
|
unsigned int getChildCount();
|
||||||
GuiComponent* getChild(unsigned int i);
|
GuiComponent* getChild(unsigned int i);
|
||||||
|
unsigned char getOpacity();
|
||||||
|
void setOpacity(unsigned char opacity);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
//Default implementation just renders children - you should probably always call GuiComponent::onRender at some point in your custom onRender.
|
//Default implementation just renders children - you should probably always call GuiComponent::onRender at some point in your custom onRender.
|
||||||
virtual void onRender();
|
virtual void onRender();
|
||||||
|
|
||||||
|
unsigned char mOpacity;
|
||||||
Window* mWindow;
|
Window* mWindow;
|
||||||
GuiComponent* mParent;
|
GuiComponent* mParent;
|
||||||
Vector2i mOffset;
|
Vector2i mOffset;
|
||||||
|
|
|
@ -352,8 +352,6 @@ bool ImageComponent::hasImage()
|
||||||
return !mPath.empty();
|
return !mPath.empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned char ImageComponent::getOpacity() { return mOpacity; }
|
|
||||||
void ImageComponent::setOpacity(unsigned char opacity) { mOpacity = opacity; }
|
|
||||||
|
|
||||||
void ImageComponent::copyScreen()
|
void ImageComponent::copyScreen()
|
||||||
{
|
{
|
||||||
|
|
|
@ -38,9 +38,6 @@ public:
|
||||||
void init();
|
void init();
|
||||||
void deinit();
|
void deinit();
|
||||||
|
|
||||||
unsigned char getOpacity();
|
|
||||||
void setOpacity(unsigned char opacity);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void onRender();
|
void onRender();
|
||||||
|
|
||||||
|
@ -51,8 +48,6 @@ private:
|
||||||
|
|
||||||
bool mAllowUpscale, mTiled, mFlipX, mFlipY;
|
bool mAllowUpscale, mTiled, mFlipX, mFlipY;
|
||||||
|
|
||||||
unsigned char mOpacity;
|
|
||||||
|
|
||||||
void loadImage(std::string path);
|
void loadImage(std::string path);
|
||||||
void resize();
|
void resize();
|
||||||
void buildImageArray(int x, int y, GLfloat* points, GLfloat* texs, float percentageX = 1, float percentageY = 1); //writes 12 GLfloat points and 12 GLfloat texture coordinates to a given array at a given position
|
void buildImageArray(int x, int y, GLfloat* points, GLfloat* texs, float percentageX = 1, float percentageY = 1); //writes 12 GLfloat points and 12 GLfloat texture coordinates to a given array at a given position
|
||||||
|
|
|
@ -74,7 +74,7 @@ void TextComponent::onRender()
|
||||||
|
|
||||||
Renderer::pushClipRect(getGlobalOffset(), getSize());
|
Renderer::pushClipRect(getGlobalOffset(), getSize());
|
||||||
|
|
||||||
Renderer::drawWrappedText(mText, (int)-mScrollPos.x, (int)-mScrollPos.y, mSize.x, mColor, font);
|
Renderer::drawWrappedText(mText, (int)-mScrollPos.x, (int)-mScrollPos.y, mSize.x, mColor >> 8 << 8 | getOpacity(), font);
|
||||||
|
|
||||||
Renderer::popClipRect();
|
Renderer::popClipRect();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue