mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-27 00:25:38 +00:00
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
This commit is contained in:
commit
2649939f0f
|
@ -37,8 +37,9 @@ class Window;
|
||||||
class GuiComponent
|
class GuiComponent
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
GuiComponent(Window* window);
|
GuiComponent(Window *window);
|
||||||
virtual ~GuiComponent();
|
|
||||||
|
virtual ~GuiComponent() noexcept;
|
||||||
|
|
||||||
virtual void textInput(const std::string& text);
|
virtual void textInput(const std::string& text);
|
||||||
|
|
||||||
|
|
|
@ -51,6 +51,7 @@ BadgesComponent::BadgesComponent(Window *window)
|
||||||
}
|
}
|
||||||
|
|
||||||
BadgesComponent::~BadgesComponent() {
|
BadgesComponent::~BadgesComponent() {
|
||||||
|
mChildren.clear();
|
||||||
mBadgeIcons.clear();
|
mBadgeIcons.clear();
|
||||||
mImageComponents.clear();
|
mImageComponents.clear();
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,12 +121,12 @@ void FlexboxComponent::computeLayout()
|
||||||
float y = anchorY - anchorOriginY * size.y;
|
float y = anchorY - anchorOriginY * size.y;
|
||||||
|
|
||||||
// Apply item margin.
|
// 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))
|
(mDirection == "column" && i >= (int) mItemsPerLine))
|
||||||
x += mItemMargin.x * (directionLine.x >= 0.0f ? 1.0f : -1.0f);
|
x += mItemMargin.x * (directionLine.x >= 0.0f ? 1.0f : -1.0f);
|
||||||
if ((mDirection == "column" && i % std::max(1, (int) mItemsPerLine) != 0) ||
|
if ((mDirection == "column" && i % std::max(1, (int) mItemsPerLine) != 0) ||
|
||||||
(mDirection == "row" && i >= (int) mItemsPerLine))
|
(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
|
// Apply alignment
|
||||||
if (mAlign == ITEM_ALIGN_END) {
|
if (mAlign == ITEM_ALIGN_END) {
|
||||||
|
|
|
@ -47,7 +47,7 @@ public:
|
||||||
void rasterizeAt(size_t width, size_t height);
|
void rasterizeAt(size_t width, size_t height);
|
||||||
glm::vec2 getSourceImageSize() const { return mSourceSize; }
|
glm::vec2 getSourceImageSize() const { return mSourceSize; }
|
||||||
|
|
||||||
virtual ~TextureResource();
|
virtual ~TextureResource() noexcept;
|
||||||
|
|
||||||
bool isInitialized() const { return true; }
|
bool isInitialized() const { return true; }
|
||||||
bool isTiled() const;
|
bool isTiled() const;
|
||||||
|
|
Loading…
Reference in a new issue