Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-17 22:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finishing touches on ScraperSearchComponent.

Browse source
This commit is contained in:
Aloshi 2014-03-25 17:47:36 -05:00
parent e931a51017
commit 41d8263086
2 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/ComponentGrid.cpp
View file

@ -1,6 +1,7 @@
#include "ComponentGrid.h" #include "ComponentGrid.h"
#include "../Log.h" #include "../Log.h"
#include "../Renderer.h" #include "../Renderer.h"
#include "../Settings.h"
using namespace GridFlags; using namespace GridFlags;
@ -146,11 +147,13 @@ void ComponentGrid::updateSeparators()
{ {
mLines.clear(); mLines.clear();
bool drawAll = Settings::getInstance()->getBool("DebugGrid");
Eigen::Vector2f pos; Eigen::Vector2f pos;
Eigen::Vector2f size; Eigen::Vector2f size;
for(auto it = mCells.begin(); it != mCells.end(); it++) for(auto it = mCells.begin(); it != mCells.end(); it++)
{ {
if(!it->border) if(!it->border && !drawAll)
continue; continue;
// find component position + size // find component position + size
@ -165,22 +168,22 @@ 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(it->border & BORDER_TOP) if(it->border & BORDER_TOP || drawAll)
{ {
mLines.push_back(Vert(pos.x(), pos.y())); mLines.push_back(Vert(pos.x(), pos.y()));
mLines.push_back(Vert(pos.x() + size.x(), pos.y())); mLines.push_back(Vert(pos.x() + size.x(), pos.y()));
} }
if(it->border & BORDER_BOTTOM) if(it->border & BORDER_BOTTOM || drawAll)
{ {
mLines.push_back(Vert(pos.x(), pos.y() + size.y())); mLines.push_back(Vert(pos.x(), pos.y() + size.y()));
mLines.push_back(Vert(pos.x() + size.x(), mLines.back().y)); mLines.push_back(Vert(pos.x() + size.x(), mLines.back().y));
} }
if(it->border & BORDER_LEFT) if(it->border & BORDER_LEFT || drawAll)
{ {
mLines.push_back(Vert(pos.x(), pos.y())); mLines.push_back(Vert(pos.x(), pos.y()));
mLines.push_back(Vert(pos.x(), pos.y() + size.y())); mLines.push_back(Vert(pos.x(), pos.y() + size.y()));
} }
if(it->border & BORDER_RIGHT) if(it->border & BORDER_RIGHT || drawAll)
{ {
mLines.push_back(Vert(pos.x() + size.x(), pos.y())); mLines.push_back(Vert(pos.x() + size.x(), pos.y()));
mLines.push_back(Vert(mLines.back().x, pos.y() + size.y())); mLines.push_back(Vert(mLines.back().x, pos.y() + size.y()));

29
src/components/ScraperSearchComponent.cpp
View file

@ -58,13 +58,13 @@ ScraperSearchComponent::ScraperSearchComponent(Window* window, SearchType type)
mMD_Pairs.push_back(MetaDataPair(std::make_shared<TextComponent>(mWindow, "GENRE:", font, mdLblColor), mMD_Genre)); mMD_Pairs.push_back(MetaDataPair(std::make_shared<TextComponent>(mWindow, "GENRE:", font, mdLblColor), mMD_Genre));
mMD_Pairs.push_back(MetaDataPair(std::make_shared<TextComponent>(mWindow, "PLAYERS:", font, mdLblColor), mMD_Players)); mMD_Pairs.push_back(MetaDataPair(std::make_shared<TextComponent>(mWindow, "PLAYERS:", font, mdLblColor), mMD_Players));
mMD_Grid = std::make_shared<ComponentGrid>(mWindow, Vector2i(2, mMD_Pairs.size())); mMD_Grid = std::make_shared<ComponentGrid>(mWindow, Vector2i(2, mMD_Pairs.size()*2 - 1));
unsigned int i = 0; unsigned int i = 0;
for(auto it = mMD_Pairs.begin(); it != mMD_Pairs.end(); it++) for(auto it = mMD_Pairs.begin(); it != mMD_Pairs.end(); it++)
{ {
mMD_Grid->setEntry(it->first, Vector2i(0, i), false, true); mMD_Grid->setEntry(it->first, Vector2i(0, i), false, true);
mMD_Grid->setEntry(it->second, Vector2i(1, i), false, it->resize); mMD_Grid->setEntry(it->second, Vector2i(1, i), false, it->resize);
i++; i += 2;
} }
mGrid.setEntry(mMD_Grid, Vector2i(2, 1), false, false); mGrid.setEntry(mMD_Grid, Vector2i(2, 1), false, false);
@ -90,16 +90,18 @@ void ScraperSearchComponent::onSizeChanged()
if(mSearchType == ALWAYS_ACCEPT_FIRST_RESULT) // show name if(mSearchType == ALWAYS_ACCEPT_FIRST_RESULT) // show name
mGrid.setRowHeightPerc(0, (mResultName->getFont()->getHeight()) / mGrid.getSize().y()); // result name mGrid.setRowHeightPerc(0, (mResultName->getFont()->getHeight()) / mGrid.getSize().y()); // result name
else else
mGrid.setRowHeightPerc(0, 0.05f); // hide name but do padding mGrid.setRowHeightPerc(0, 0.0825f); // hide name but do padding
mGrid.setRowHeightPerc(2, 0.375f); // description mGrid.setRowHeightPerc(1, 0.505f);
const float boxartCellScale = 0.85f;
// limit thumbnail size using setMaxHeight - we do this instead of letting mGrid call setSize because it maintains the aspect ratio // limit thumbnail size using setMaxHeight - we do this instead of letting mGrid call setSize because it maintains the aspect ratio
// we also pad a little so it doesn't rub up against the metadata labels // we also pad a little so it doesn't rub up against the metadata labels
mResultThumbnail->setMaxSize(mGrid.getColWidth(1) * 0.85f, mGrid.getRowHeight(1) * 0.85f); mResultThumbnail->setMaxSize(mGrid.getColWidth(1) * boxartCellScale, mGrid.getRowHeight(1));
// metadata // metadata
mMD_Grid->setSize(mGrid.getColWidth(2), mGrid.getRowHeight(1) * 0.9f); mMD_Grid->setSize(mGrid.getColWidth(2), mGrid.getRowHeight(1));
if(mMD_Grid->getSize().y() > mMD_Pairs.size()) if(mMD_Grid->getSize().y() > mMD_Pairs.size())
{ {
const int fontHeight = (int)(mMD_Grid->getSize().y() / mMD_Pairs.size() * 0.8f); const int fontHeight = (int)(mMD_Grid->getSize().y() / mMD_Pairs.size() * 0.8f);
@ -116,6 +118,11 @@ void ScraperSearchComponent::onSizeChanged()
maxLblWidth = it->first->getSize().x() + 6; maxLblWidth = it->first->getSize().x() + 6;
} }
for(unsigned int i = 0; i < mMD_Pairs.size(); i++)
{
mMD_Grid->setRowHeightPerc(i*2, (fontLbl->getLetterHeight() + 2) / mMD_Grid->getSize().y());
}
// update component fonts // update component fonts
mMD_ReleaseDate->setFont(fontComp); mMD_ReleaseDate->setFont(fontComp);
mMD_Developer->setFont(fontComp); mMD_Developer->setFont(fontComp);
@ -132,9 +139,11 @@ void ScraperSearchComponent::onSizeChanged()
// make result font follow label font // make result font follow label font
mResultDesc->setFont(Font::get(fontHeight, FONT_PATH_REGULAR)); mResultDesc->setFont(Font::get(fontHeight, FONT_PATH_REGULAR));
} }
mGrid.onSizeChanged();
mDescContainer->setSize(mGrid.getColWidth(1)*boxartCellScale + mGrid.getColWidth(2), mResultDesc->getFont()->getHeight() * 3);
mResultDesc->setSize(mDescContainer->getSize().x(), 0); // make desc text wrap at edge of container mResultDesc->setSize(mDescContainer->getSize().x(), 0); // make desc text wrap at edge of container
mGrid.onSizeChanged();
} }
void ScraperSearchComponent::updateViewStyle() void ScraperSearchComponent::updateViewStyle()
@ -153,7 +162,7 @@ void ScraperSearchComponent::updateViewStyle()
mGrid.setEntry(mResultName, Vector2i(1, 0), false, true, Vector2i(2, 1), GridFlags::BORDER_TOP); mGrid.setEntry(mResultName, Vector2i(1, 0), false, true, Vector2i(2, 1), GridFlags::BORDER_TOP);
// show description on the right // show description on the right
mGrid.setEntry(mDescContainer, Vector2i(3, 0), false, true, Vector2i(1, 3), GridFlags::BORDER_TOP | GridFlags::BORDER_BOTTOM); mGrid.setEntry(mDescContainer, Vector2i(3, 0), false, false, Vector2i(1, 3), GridFlags::BORDER_TOP | GridFlags::BORDER_BOTTOM);
mResultDesc->setSize(mDescContainer->getSize().x(), 0); // make desc text wrap at edge of container mResultDesc->setSize(mDescContainer->getSize().x(), 0); // make desc text wrap at edge of container
}else{ }else{
// fake row where name would be // fake row where name would be
@ -163,7 +172,7 @@ void ScraperSearchComponent::updateViewStyle()
mGrid.setEntry(mResultList, Vector2i(3, 0), true, true, Vector2i(1, 3), GridFlags::BORDER_LEFT | GridFlags::BORDER_TOP | GridFlags::BORDER_BOTTOM); mGrid.setEntry(mResultList, Vector2i(3, 0), true, true, Vector2i(1, 3), GridFlags::BORDER_LEFT | GridFlags::BORDER_TOP | GridFlags::BORDER_BOTTOM);
// show description under image/info // show description under image/info
mGrid.setEntry(mDescContainer, Vector2i(1, 2), false, true, Vector2i(2, 1), GridFlags::BORDER_BOTTOM); mGrid.setEntry(mDescContainer, Vector2i(1, 2), false, false, Vector2i(2, 1), GridFlags::BORDER_BOTTOM);
mResultDesc->setSize(mDescContainer->getSize().x(), 0); // make desc text wrap at edge of container mResultDesc->setSize(mDescContainer->getSize().x(), 0); // make desc text wrap at edge of container
} }
} }