Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-03-06 14:27:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoided some SVG rasterization attempts before the image size was set for some built-in assets.

Browse source
This commit is contained in:
Leon Styhre 2023-02-15 23:58:50 +01:00
parent 1939080e82
commit 14ac905e09
7 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
es-app/src/guis/GuiMetaDataEd.cpp
View file

@ -103,7 +103,6 @@ GuiMetaDataEd::GuiMetaDataEd(MetaDataList* md,
// Set up scroll indicators.
mScrollUp = std::make_shared<ImageComponent>();
mScrollDown = std::make_shared<ImageComponent>();
mScrollIndicator = std::make_shared<ScrollIndicatorComponent>(mList, mScrollUp, mScrollDown);
mScrollUp->setResize(0.0f, mTitle->getFont()->getLetterHeight() / 2.0f);
mScrollUp->setOrigin(0.0f, -0.35f);
@ -111,6 +110,8 @@ GuiMetaDataEd::GuiMetaDataEd(MetaDataList* md,
mScrollDown->setResize(0.0f, mTitle->getFont()->getLetterHeight() / 2.0f);
mScrollDown->setOrigin(0.0f, 0.35f);
mScrollIndicator = std::make_shared<ScrollIndicatorComponent>(mList, mScrollUp, mScrollDown);
mGrid.setEntry(mScrollUp, glm::ivec2 {1, 0}, false, false, glm::ivec2 {1, 1});
mGrid.setEntry(mScrollDown, glm::ivec2 {1, 1}, false, false, glm::ivec2 {1, 1});

5
es-app/src/guis/GuiScraperMulti.cpp
View file

@ -84,8 +84,6 @@ GuiScraperMulti::GuiScraperMulti(const std::queue<ScraperSearchParams>& searches
// Set up scroll indicators.
mScrollUp = std::make_shared<ImageComponent>();
mScrollDown = std::make_shared<ImageComponent>();
mScrollIndicator =
std::make_shared<ScrollIndicatorComponent>(mResultList, mScrollUp, mScrollDown);
mScrollUp->setResize(0.0f, mTitle->getFont()->getLetterHeight() / 2.0f);
mScrollUp->setOrigin(0.0f, -0.35f);
@ -93,6 +91,9 @@ GuiScraperMulti::GuiScraperMulti(const std::queue<ScraperSearchParams>& searches
mScrollDown->setResize(0.0f, mTitle->getFont()->getLetterHeight() / 2.0f);
mScrollDown->setOrigin(0.0f, 0.35f);
mScrollIndicator =
std::make_shared<ScrollIndicatorComponent>(mResultList, mScrollUp, mScrollDown);
mGrid.setEntry(mScrollUp, glm::ivec2 {1, 0}, false, false, glm::ivec2 {1, 1});
mGrid.setEntry(mScrollDown, glm::ivec2 {1, 1}, false, false, glm::ivec2 {1, 1});

5
es-app/src/guis/GuiScraperSingle.cpp
View file

@ -68,8 +68,6 @@ GuiScraperSingle::GuiScraperSingle(ScraperSearchParams& params,
// Set up scroll indicators.
mScrollUp = std::make_shared<ImageComponent>();
mScrollDown = std::make_shared<ImageComponent>();
mScrollIndicator =
std::make_shared<ScrollIndicatorComponent>(mResultList, mScrollUp, mScrollDown);
mScrollUp->setResize(0.0f, mGameName->getFont()->getLetterHeight() / 2.0f);
mScrollUp->setOrigin(0.0f, -0.35f);
@ -77,6 +75,9 @@ GuiScraperSingle::GuiScraperSingle(ScraperSearchParams& params,
mScrollDown->setResize(0.0f, mGameName->getFont()->getLetterHeight() / 2.0f);
mScrollDown->setOrigin(0.0f, 0.35f);
mScrollIndicator =
std::make_shared<ScrollIndicatorComponent>(mResultList, mScrollUp, mScrollDown);
mGrid.setEntry(mScrollUp, glm::ivec2 {1, 0}, false, false, glm::ivec2 {1, 1});
mGrid.setEntry(mScrollDown, glm::ivec2 {1, 1}, false, false, glm::ivec2 {1, 1});

3
es-core/src/components/BusyComponent.cpp
View file

@ -27,7 +27,6 @@ BusyComponent::BusyComponent()
, mGrid {glm::ivec2 {5, 3}}
{
mAnimation = std::make_shared<AnimatedImageComponent>();
mAnimation->load(&BUSY_ANIMATION_DEF);
mText = std::make_shared<TextComponent>("WORKING...", Font::get(FONT_SIZE_MEDIUM), 0x777777FF);
// Col 0 = animation, col 1 = spacer, col 2 = text.
@ -61,6 +60,8 @@ void BusyComponent::onSizeChanged()
mBackground.fitTo(glm::vec2 {mGrid.getColWidth(1) + mGrid.getColWidth(2) + mGrid.getColWidth(3),
textHeight + (2.0f * Renderer::getScreenResolutionModifier())},
mAnimation->getPosition(), glm::vec2 {});
mAnimation->load(&BUSY_ANIMATION_DEF);
}
void BusyComponent::reset()

3
es-core/src/components/MenuComponent.cpp
View file

@ -43,7 +43,6 @@ MenuComponent::MenuComponent(std::string title, const std::shared_ptr<Font>& tit
// Set up scroll indicators.
mScrollUp = std::make_shared<ImageComponent>();
mScrollDown = std::make_shared<ImageComponent>();
mScrollIndicator = std::make_shared<ScrollIndicatorComponent>(mList, mScrollUp, mScrollDown);
mScrollUp->setResize(0.0f, mTitle->getFont()->getLetterHeight() / 2.0f);
mScrollUp->setOrigin(0.0f, -0.35f);
@ -51,6 +50,8 @@ MenuComponent::MenuComponent(std::string title, const std::shared_ptr<Font>& tit
mScrollDown->setResize(0.0f, mTitle->getFont()->getLetterHeight() / 2.0f);
mScrollDown->setOrigin(0.0f, 0.35f);
mScrollIndicator = std::make_shared<ScrollIndicatorComponent>(mList, mScrollUp, mScrollDown);
mGrid.setEntry(mScrollUp, glm::ivec2 {1, 0}, false, false, glm::ivec2 {1, 1});
mGrid.setEntry(mScrollDown, glm::ivec2 {1, 1}, false, false, glm::ivec2 {1, 1});

8
es-core/src/components/SliderComponent.cpp
View file

@ -26,17 +26,19 @@ SliderComponent::SliderComponent(float min, float max, float increment, const st
{
assert((min - max) != 0.0f);
setSize(mWindow->peekGui()->getSize().x * 0.26f,
Font::get(FONT_SIZE_MEDIUM)->getLetterHeight());
// Some sane default value.
mValue = (max + min) / 2.0f;
mKnob.setResize(0.0f, std::round(mSize.y * 0.7f));
mKnob.setOrigin(0.5f, 0.0f);
mKnob.setImage(":/graphics/slider_knob.svg");
mKnobDisabled.setResize(0.0f, std::round(mSize.y * 0.7f));
mKnobDisabled.setOrigin(0.5f, 0.0f);
mKnobDisabled.setImage(":/graphics/slider_knob_disabled.svg");
setSize(mWindow->peekGui()->getSize().x * 0.26f,
Font::get(FONT_SIZE_MEDIUM)->getLetterHeight());
}
bool SliderComponent::input(InputConfig* config, Input input)

1
es-core/src/components/SliderComponent.h
View file

@ -40,7 +40,6 @@ public:
void setOpacity(float opacity) override
{
mOpacity = opacity;
mKnob.setOpacity(opacity);
mTextCache->setOpacity(opacity);
}