Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly fixed NinePatchComponent so it scales with the screen resolution.

Browse source
This commit is contained in:
Leon Styhre 2021-01-14 22:55:07 +01:00
parent 1148f941a9
commit f71f4704ce
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
es-core/src/components/NinePatchComponent.cpp
View file

@ -18,7 +18,7 @@ NinePatchComponent::NinePatchComponent(
unsigned int edgeColor, unsigned int edgeColor,
unsigned int centerColor) unsigned int centerColor)
: GuiComponent(window), : GuiComponent(window),
mCornerSize(16, 16), mCornerSize(16.0f, 16.0f),
mEdgeColor(edgeColor), mEdgeColor(edgeColor),
mCenterColor(centerColor), mCenterColor(centerColor),
mPath(path), mPath(path),
@ -52,7 +52,8 @@ void NinePatchComponent::buildVertices()
if (mVertices != nullptr) if (mVertices != nullptr)
delete[] mVertices; delete[] mVertices;
mTexture = TextureResource::get(mPath); // Scale the corner size according to the screen resolution.
mTexture = TextureResource::get(mPath, false, false, true, Renderer::getScreenWidthModifier());
if (mTexture->getSize() == Vector2i::Zero()) { if (mTexture->getSize() == Vector2i::Zero()) {
mVertices = nullptr; mVertices = nullptr;
@ -63,22 +64,8 @@ void NinePatchComponent::buildVertices()
Vector2f texSize; Vector2f texSize;
mVertices = new Renderer::Vertex[6 * 9]; mVertices = new Renderer::Vertex[6 * 9];
// This is just a partial fix, the plan is to always scale according to the screen texSize = Vector2f(static_cast<float>(mTexture->getSize().x()),
// resolution. But unfortunately doing this for the menu frame leads to flickering when static_cast<float>(mTexture->getSize().y()));
// entering a submenu, probably because the texture is unloaded and re-rasterized at the
// higher resolution. So for the moment the frame.png texture is still used (which won't be
// scaled as that leads to ugly pixelated corners for the menus). Scaling ButtonComponent
// works perfect with the below code though.
if (mIsScalable) {
texSize = Vector2f(static_cast<float>(mTexture->getSize().x()) *
Renderer::getScreenWidthModifier(), static_cast<float>(mTexture->getSize().y()) *
Renderer::getScreenWidthModifier());
mTexture->rasterizeAt(static_cast<size_t>(texSize.x()), static_cast<size_t>(texSize.y()));
}
else {
texSize = Vector2f(static_cast<float>(mTexture->getSize().x()),
static_cast<float>(mTexture->getSize().y()));
}
const float imgSizeX[3] = { mCornerSize.x(), mSize.x() - mCornerSize.x() * 2, mCornerSize.x()}; const float imgSizeX[3] = { mCornerSize.x(), mSize.x() - mCornerSize.x() * 2, mCornerSize.x()};
const float imgSizeY[3] = { mCornerSize.y(), mSize.y() - mCornerSize.y() * 2, mCornerSize.y()}; const float imgSizeY[3] = { mCornerSize.y(), mSize.y() - mCornerSize.y() * 2, mCornerSize.y()};