Skip to content

Fix #641: Main menu and game list options menu now loop. #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RobertoOropezaG wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #641: Main menu and game list options menu now loop. #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion es-app/src/guis/GuiGamelistOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "components/TextListComponent.h"

GuiGamelistOptions::GuiGamelistOptions(Window* window, SystemData* system) : GuiComponent(window),
mSystem(system), mMenu(window, "OPTIONS"), mFromPlaceholder(false), mFiltersChanged(false),
mSystem(system), mMenu(window, "OPTIONS", Font::get(FONT_SIZE_LARGE), LIST_ALWAYS_LOOP), mFromPlaceholder(false), mFiltersChanged(false),
mJumpToSelected(false), mMetadataChanged(false)
{
addChild(&mMenu);
Expand Down
2 changes: 1 addition & 1 deletion es-app/src/guis/GuiMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "views/gamelist/IGameListView.h"
#include "guis/GuiInfoPopup.h"

GuiMenu::GuiMenu(Window* window) : GuiComponent(window), mMenu(window, "MAIN MENU"), mVersion(window)
GuiMenu::GuiMenu(Window* window) : GuiComponent(window), mMenu(window, "MAIN MENU", Font::get(FONT_SIZE_LARGE), LIST_ALWAYS_LOOP), mVersion(window)
{
bool isFullUI = UIModeController::getInstance()->isUIModeFull();

Expand Down
2 changes: 1 addition & 1 deletion es-core/src/components/ComponentList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#define TOTAL_HORIZONTAL_PADDING_PX 20

ComponentList::ComponentList(Window* window) : IList<ComponentListRow, void*>(window, LIST_SCROLL_STYLE_SLOW, LIST_NEVER_LOOP)
ComponentList::ComponentList(Window* window, ListLoopType loop_type) : IList<ComponentListRow, void*>(window, LIST_SCROLL_STYLE_SLOW, loop_type)
{
mSelectorBarOffset = 0;
mCameraOffset = 0;
Expand Down
2 changes: 1 addition & 1 deletion es-core/src/components/ComponentList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct ComponentListRow
class ComponentList : public IList<ComponentListRow, void*>
{
public:
ComponentList(Window* window);
ComponentList(Window* window, ListLoopType loop_type = LIST_NEVER_LOOP);

void addRow(const ComponentListRow& row, bool setCursorHere = false);

Expand Down
4 changes: 2 additions & 2 deletions es-core/src/components/MenuComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#define TITLE_HEIGHT (mTitle->getFont()->getLetterHeight() + TITLE_VERT_PADDING)

MenuComponent::MenuComponent(Window* window, const char* title, const std::shared_ptr<Font>& titleFont) : GuiComponent(window),
MenuComponent::MenuComponent(Window* window, const char* title, const std::shared_ptr<Font>& titleFont, ListLoopType loop_type) : GuiComponent(window),
mBackground(window), mGrid(window, Vector2i(1, 3))
{
addChild(&mBackground);
Expand All @@ -23,7 +23,7 @@ MenuComponent::MenuComponent(Window* window, const char* title, const std::share
mGrid.setEntry(mTitle, Vector2i(0, 0), false);

// set up list which will never change (externally, anyway)
mList = std::make_shared<ComponentList>(mWindow);
mList = std::make_shared<ComponentList>(mWindow, loop_type);
mGrid.setEntry(mList, Vector2i(0, 1), true);

updateGrid();
Expand Down
2 changes: 1 addition & 1 deletion es-core/src/components/MenuComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ std::shared_ptr<ImageComponent> makeArrow(Window* window);
class MenuComponent : public GuiComponent
{
public:
MenuComponent(Window* window, const char* title, const std::shared_ptr<Font>& titleFont = Font::get(FONT_SIZE_LARGE));
MenuComponent(Window* window, const char* title, const std::shared_ptr<Font>& titleFont = Font::get(FONT_SIZE_LARGE), ListLoopType loop_type = LIST_NEVER_LOOP);

void onSizeChanged() override;

Expand Down