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

Merge branch '63-add-badges-decals-e-g-for-favorites-completed-games-non-working-games-collections-and-folders' into 575-theme-add-a-modern-clean-switch-like-theme-as-an-official-theme-in-es-de-to-choose-from

Browse source
This commit is contained in:
Sophia Hadash 2021-09-26 23:04:38 +02:00
parent 77ac53edb8 2b8c95d2ef
commit 2649939f0f
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,8 +37,9 @@ class Window;
class GuiComponent
{
public:
GuiComponent(Window* window);
virtual ~GuiComponent();
GuiComponent(Window *window);
virtual ~GuiComponent() noexcept;
virtual void textInput(const std::string& text);

1
es-core/src/components/BadgesComponent.cpp
View file

@ -51,6 +51,7 @@ BadgesComponent::BadgesComponent(Window *window)
}
BadgesComponent::~BadgesComponent() {
mChildren.clear();
mBadgeIcons.clear();
mImageComponents.clear();
}

4
es-core/src/components/FlexboxComponent.cpp
View file

@ -121,12 +121,12 @@ void FlexboxComponent::computeLayout()
float y = anchorY - anchorOriginY * size.y;
// Apply item margin.
if ((mDirection == "row" && i % std::max(1, (int) mItemsPerLine) != 0) ||
/*if ((mDirection == "row" && i % std::max(1, (int) mItemsPerLine) != 0) ||
(mDirection == "column" && i >= (int) mItemsPerLine))
x += mItemMargin.x * (directionLine.x >= 0.0f ? 1.0f : -1.0f);
if ((mDirection == "column" && i % std::max(1, (int) mItemsPerLine) != 0) ||
(mDirection == "row" && i >= (int) mItemsPerLine))
y += mItemMargin.y * (directionLine.y >= 0.0f ? 1.0f : -1.0f);
y += mItemMargin.y * (directionLine.y >= 0.0f ? 1.0f : -1.0f);*/
// Apply alignment
if (mAlign == ITEM_ALIGN_END) {

2
es-core/src/resources/TextureResource.h
View file

@ -47,7 +47,7 @@ public:
void rasterizeAt(size_t width, size_t height);
glm::vec2 getSourceImageSize() const { return mSourceSize; }
virtual ~TextureResource();
virtual ~TextureResource() noexcept;
bool isInitialized() const { return true; }
bool isTiled() const;