Skip to content
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

Jump to bottom

Limit height of scrollable lists #3621

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Limit height of scrollable lists #3621

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
14 changes: 7 additions & 7 deletions src/frontend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ void startOptionsMenu()
addTextButton(FRONTEND_MUSICMANAGER, _("Music Manager"), WBUT_TXTCENTRE);
addTextButton(FRONTEND_MULTIPLAYOPTIONS, _("Multiplay Options"), WBUT_TXTCENTRE);

scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_POS9Y - FRONTEND_POS2Y);
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_BUTHEIGHT_LIST_SPACER);
parent->attach(scrollableList);

addSideText(FRONTEND_SIDETEXT, FRONTEND_SIDEX, FRONTEND_SIDEY, _("OPTIONS"));
Expand Down Expand Up @@ -1250,7 +1250,7 @@ void startGraphicsOptionsMenu()
grid->setGeometry(0, 0, FRONTEND_BUTWIDTH, grid->idealHeight());

auto scrollableList = ScrollableListWidget::make();
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_POS2Y - 1);
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_BUTHEIGHT_LIST_SPACER);
scrollableList->addItem(grid);
parent->attach(scrollableList);

Expand Down Expand Up @@ -1484,7 +1484,7 @@ void startAudioAndZoomOptionsMenu()
grid->setGeometry(0, 0, FRONTEND_BUTWIDTH, grid->idealHeight());

auto scrollableList = ScrollableListWidget::make();
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_POS2Y - 1);
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_BUTHEIGHT_LIST_SPACER);
scrollableList->addItem(grid);
parent->attach(scrollableList);

Expand Down Expand Up @@ -2248,7 +2248,7 @@ void startVideoOptionsMenu()
grid->setGeometry(0, 0, FRONTEND_BUTWIDTH, grid->idealHeight());

auto scrollableList = ScrollableListWidget::make();
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_POS2Y - 1);
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_BUTHEIGHT_LIST_SPACER);
scrollableList->addItem(grid);
parent->attach(scrollableList);

Expand Down Expand Up @@ -2548,7 +2548,7 @@ void startMouseOptionsMenu()
grid->setGeometry(0, 0, FRONTEND_BUTWIDTH, grid->idealHeight());

auto scrollableList = ScrollableListWidget::make();
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_POS2Y - 1);
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_BUTHEIGHT_LIST_SPACER);
scrollableList->addItem(grid);
parent->attach(scrollableList);

Expand Down Expand Up @@ -2989,7 +2989,7 @@ void startGameOptionsMenu()
grid->setGeometry(0, 0, FRONTEND_BUTWIDTH_WIDE, grid->idealHeight());

auto scrollableList = ScrollableListWidget::make();
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORM_WIDEW - 1, FRONTEND_BOTFORM_WIDEH - FRONTEND_POS2Y - 1);
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORM_WIDEW - 1, FRONTEND_BOTFORM_WIDEH - FRONTEND_BUTHEIGHT_LIST_SPACER);
scrollableList->addItem(grid);
widgGetFromID(psWScreen, FRONTEND_BOTFORM)->attach(scrollableList);

Expand Down Expand Up @@ -3428,7 +3428,7 @@ void startMultiplayOptionsMenu()
grid->setGeometry(0, 0, FRONTEND_BUTWIDTH, grid->idealHeight());

auto scrollableList = ScrollableListWidget::make();
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_POS2Y - 1);
scrollableList->setGeometry(0, FRONTEND_POS2Y, FRONTEND_BOTFORMW - 1, FRONTEND_BOTFORMH - FRONTEND_BUTHEIGHT_LIST_SPACER);
scrollableList->addItem(grid);
parent->attach(scrollableList);

Expand Down
3 changes: 2 additions & 1 deletion src/frontend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,11 @@ struct DisplayTextOptionCache
#define FRONTEND_BOTFORM_WIDEW 580
#define FRONTEND_BOTFORM_WIDEH FRONTEND_BOTFORMH // keep Y+H < 480 (minimum display height)


#define FRONTEND_BUTWIDTH FRONTEND_BOTFORMW-40 // text button sizes.
#define FRONTEND_BUTHEIGHT 35

#define FRONTEND_BUTHEIGHT_LIST_SPACER (FRONTEND_BUTHEIGHT + 15)

#define FRONTEND_BUTWIDTH_WIDE FRONTEND_BOTFORM_WIDEW-40 // text button sizes.
#define FRONTEND_BUTHEIGHT_WIDE FRONTEND_BUTHEIGHT

Expand Down
Loading