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

Fixed an issue where separator lines would not be rendered correctly.

Browse source
This commit is contained in:
Leon Styhre 2021-01-16 22:52:10 +01:00
parent b5b70a4931
commit 9589778107
2 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
es-core/src/components/ComponentGrid.cpp
View file

@ -161,7 +161,7 @@ void ComponentGrid::updateCellComponent(const GridEntry& cell)
void ComponentGrid::updateSeparators() void ComponentGrid::updateSeparators()
{ {
mLines.clear(); mSeparators.clear();
const unsigned int color = Renderer::convertRGBAToABGR(0xC6C7C6FF); const unsigned int color = Renderer::convertRGBAToABGR(0xC6C7C6FF);
bool drawAll = Settings::getInstance()->getBool("DebugGrid"); bool drawAll = Settings::getInstance()->getBool("DebugGrid");
@ -185,21 +185,40 @@ void ComponentGrid::updateSeparators()
for (int y = it->pos.y(); y < it->pos.y() + it->dim.y(); y++) for (int y = it->pos.y(); y < it->pos.y() + it->dim.y(); y++)
size[1] += getRowHeight(y); size[1] += getRowHeight(y);
if (size == 0)
return;
if (it->border & BORDER_TOP || drawAll) { if (it->border & BORDER_TOP || drawAll) {
mLines.push_back( { { pos.x(), pos.y() }, { 0.0f, 0.0f }, color } ); std::vector<float> coordVector;
mLines.push_back( { { pos.x() + size.x(), pos.y() }, { 0.0f, 0.0f }, color } ); coordVector.push_back(pos.x());
coordVector.push_back(pos.y());
coordVector.push_back(size.x());
coordVector.push_back(1.0f * Renderer::getScreenHeightModifier());
mSeparators.push_back(coordVector);
} }
if (it->border & BORDER_BOTTOM || drawAll) { if (it->border & BORDER_BOTTOM || drawAll) {
mLines.push_back( { { pos.x(), pos.y() + size.y() }, { 0.0f, 0.0f }, color } ); std::vector<float> coordVector;
mLines.push_back( { { pos.x() + size.x(), mLines.back().pos.y() }, { 0.0f, 0.0f }, color } ); coordVector.push_back(pos.x());
coordVector.push_back(pos.y() + size.y());
coordVector.push_back(size.x());
coordVector.push_back(1.0f * Renderer::getScreenHeightModifier());
mSeparators.push_back(coordVector);
} }
if (it->border & BORDER_LEFT || drawAll) { if (it->border & BORDER_LEFT || drawAll) {
mLines.push_back( { { pos.x(), pos.y() }, { 0.0f, 0.0f }, color } ); std::vector<float> coordVector;
mLines.push_back( { { pos.x(), pos.y() + size.y() }, { 0.0f, 0.0f }, color } ); coordVector.push_back(pos.x());
coordVector.push_back(pos.y());
coordVector.push_back(1.0f * Renderer::getScreenHeightModifier());
coordVector.push_back(size.y());
mSeparators.push_back(coordVector);
} }
if (it->border & BORDER_RIGHT || drawAll) { if (it->border & BORDER_RIGHT || drawAll) {
mLines.push_back( { { pos.x() + size.x(), pos.y() }, { 0.0f, 0.0f }, color } ); std::vector<float> coordVector;
mLines.push_back( { { mLines.back().pos.x(), pos.y() + size.y() }, { 0.0f, 0.0f }, color } ); coordVector.push_back(pos.x() + size.x());
coordVector.push_back(pos.y());
coordVector.push_back(1.0f * Renderer::getScreenHeightModifier());
coordVector.push_back(size.y());
mSeparators.push_back(coordVector);
} }
} }
} }
@ -352,10 +371,10 @@ void ComponentGrid::render(const Transform4x4f& parentTrans)
renderChildren(trans); renderChildren(trans);
// Draw cell separators. // Draw cell separators.
for (unsigned int i = 0; i < mLines.size(); i += 2) { for (unsigned int i = 0; i < mSeparators.size(); i++) {
Renderer::setMatrix(trans); Renderer::setMatrix(trans);
Renderer::drawRect(mLines[i].pos.x(), mLines[i].pos.y(), mLines[i + 1].pos.x(), Renderer::drawRect(mSeparators[i][0], mSeparators[i][1], mSeparators[i][2],
1.0f * Renderer::getScreenHeightModifier(), 0xC6C7C6FF, 0xC6C7C6FF); mSeparators[i][3], 0xC6C7C6FF, 0xC6C7C6FF);
} }
} }

2
es-core/src/components/ComponentGrid.h
View file

@ -129,7 +129,7 @@ private:
inline const GridEntry* getCellAt(const Vector2i& pos) const inline const GridEntry* getCellAt(const Vector2i& pos) const
{ return getCellAt(pos.x(), pos.y()); } { return getCellAt(pos.x(), pos.y()); }
std::vector<Renderer::Vertex> mLines; std::vector<std::vector<float>> mSeparators;
Vector2i mGridSize; Vector2i mGridSize;
std::vector<GridEntry> mCells; std::vector<GridEntry> mCells;
Vector2i mCursor; Vector2i mCursor;