matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove commented out code, heart icon shows even when element is selected

Browse Source
This commit is contained in:
jacob1 2016-07-24 22:43:54 -04:00
parent 8efe8853de
commit adb200d3f7
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/game/GameModel.cpp
View File

@ -371,27 +371,6 @@ void GameModel::BuildFavoritesMenu()
{ {
menuList[SC_FAVORITES]->ClearTools(); menuList[SC_FAVORITES]->ClearTools();
/*for (size_t i = 0; i < menuList.size(); i++)
{
if (i == SC_FAVORITES)
continue;
for (size_t j = 0; j < menuList[i]->GetToolList().size(); j++)
{
if (Favorite::Ref().IsFavorite(menuList[i]->GetToolList()[j]->GetIdentifier()))
{
menuList[SC_FAVORITES]->AddTool(menuList[i]->GetToolList()[j]);
}
}
}
for (size_t i = 0; i < extraElementTools.size(); i++)
{
if (Favorite::Ref().IsFavorite(extraElementTools[i]->GetIdentifier()))
{
menuList[SC_FAVORITES]->AddTool(extraElementTools[i]);
}
}*/
std::vector<std::string> favList = Favorite::Ref().GetFavoritesList(); std::vector<std::string> favList = Favorite::Ref().GetFavoritesList();
for (size_t i = 0; i < favList.size(); i++) for (size_t i = 0; i < favList.size(); i++)
{ {

2
src/gui/game/ToolButton.cpp
View File

@ -64,7 +64,7 @@ void ToolButton::Draw(const ui::Point& screenPos)
{ {
g->drawrect(screenPos.X, screenPos.Y, Size.X, Size.Y, Appearance.BorderInactive.Red, Appearance.BorderInactive.Green, Appearance.BorderInactive.Blue, Appearance.BorderInactive.Alpha); g->drawrect(screenPos.X, screenPos.Y, Size.X, Size.Y, Appearance.BorderInactive.Red, Appearance.BorderInactive.Green, Appearance.BorderInactive.Blue, Appearance.BorderInactive.Alpha);
} }
if (Favorite::Ref().IsFavorite(toolIdentifier) && currentSelection == -1) if (Favorite::Ref().IsFavorite(toolIdentifier))
{ {
g->drawtext(screenPos.X, screenPos.Y, "\xE8", Appearance.BorderFavorite.Red, Appearance.BorderFavorite.Green, Appearance.BorderFavorite.Blue, Appearance.BorderFavorite.Alpha); g->drawtext(screenPos.X, screenPos.Y, "\xE8", Appearance.BorderFavorite.Red, Appearance.BorderFavorite.Green, Appearance.BorderFavorite.Blue, Appearance.BorderFavorite.Alpha);
} }