openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Better function name for cStack changeSelectedPage()

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-03-05 20:54:52 -06:00
committed by Celtic Minstrel
parent a4516883d0
commit 531384844e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dialogxml/widgets/stack.cpp
View File

@@ -85,7 +85,7 @@ bool cStack::setPage(size_t n) {
return !failed; return !failed;
} }
void cStack::doSelectPage(int dir, bool loop) { void cStack::changeSelectedPage(int dir, bool loop) {
curPage += dir; curPage += dir;
if(loop){ if(loop){
if(curPage < 0) curPage += nPages; if(curPage < 0) curPage += nPages;

2
src/dialogxml/widgets/stack.hpp
View File

@@ -60,7 +60,7 @@ public:
/// Page forward or backward in the stack /// Page forward or backward in the stack
/// @param dir Usually -1 or 1 /// @param dir Usually -1 or 1
/// @param loop Beyond the first and last page, loop to the other side /// @param loop Beyond the first and last page, loop to the other side
void doSelectPage(int dir, bool loop = true); void changeSelectedPage(int dir, bool loop = true);
/// Get the current page the stack is displaying. /// Get the current page the stack is displaying.
/// @return The current page number /// @return The current page number
size_t getPage() const; size_t getPage() const;

18
src/game/boe.dlgutil.cpp
View File

@@ -1720,9 +1720,9 @@ class cChooseScenario {
return true; return true;
} }
bool doSelectPage(int dir) { bool changeSelectedPage(int dir) {
auto& stk = dynamic_cast<cStack&>(me["list"]); auto& stk = dynamic_cast<cStack&>(me["list"]);
stk.doSelectPage(dir, true); stk.changeSelectedPage(dir, true);
return true; return true;
} }
@@ -1762,8 +1762,8 @@ public:
set_cursor(sword_curs); set_cursor(sword_curs);
me["cancel"].attachClickHandler(std::bind(&cChooseScenario::doCancel, this)); me["cancel"].attachClickHandler(std::bind(&cChooseScenario::doCancel, this));
me["next"].attachClickHandler(std::bind(&cChooseScenario::doSelectPage, this, 1)); me["next"].attachClickHandler(std::bind(&cChooseScenario::changeSelectedPage, this, 1));
me["prev"].attachClickHandler(std::bind(&cChooseScenario::doSelectPage, this, -1)); me["prev"].attachClickHandler(std::bind(&cChooseScenario::changeSelectedPage, this, -1));
me["start1"].attachClickHandler(std::bind(&cChooseScenario::doSelectScenario, this, 0)); me["start1"].attachClickHandler(std::bind(&cChooseScenario::doSelectScenario, this, 0));
me["start2"].attachClickHandler(std::bind(&cChooseScenario::doSelectScenario, this, 1)); me["start2"].attachClickHandler(std::bind(&cChooseScenario::doSelectScenario, this, 1));
me["start3"].attachClickHandler(std::bind(&cChooseScenario::doSelectScenario, this, 2)); me["start3"].attachClickHandler(std::bind(&cChooseScenario::doSelectScenario, this, 2));
@@ -2011,11 +2011,11 @@ class cFilePicker {
return true; return true;
} }
bool doSelectPage(int dir) { bool changeSelectedPage(int dir) {
auto& stk = dynamic_cast<cStack&>(me["list"]); auto& stk = dynamic_cast<cStack&>(me["list"]);
// This stack doesn't loop. It's easier to implement loading the files one page at a time // This stack doesn't loop. It's easier to implement loading the files one page at a time
// if I know we're not gonna jump from page 0 to the last page, leaving a gap in the vector. // if I know we're not gonna jump from page 0 to the last page, leaving a gap in the vector.
stk.doSelectPage(dir); stk.changeSelectedPage(dir);
me["prev"].show(); me["prev"].show();
me["next"].show(); me["next"].show();
if(stk.getPage() == 0){ if(stk.getPage() == 0){
@@ -2089,8 +2089,8 @@ public:
// when replaying, basically make Left/Right buttons no-op. // when replaying, basically make Left/Right buttons no-op.
// Load/Save buttons should send a dummy result. // Load/Save buttons should send a dummy result.
if(!replaying){ if(!replaying){
me["next"].attachClickHandler(std::bind(&cFilePicker::doSelectPage, this, 1)); me["next"].attachClickHandler(std::bind(&cFilePicker::changeSelectedPage, this, 1));
me["prev"].attachClickHandler(std::bind(&cFilePicker::doSelectPage, this, -1)); me["prev"].attachClickHandler(std::bind(&cFilePicker::changeSelectedPage, this, -1));
init_pages(); init_pages();
}else{ }else{
for(int i = 0; i < SLOTS_PER_PAGE; ++i){ for(int i = 0; i < SLOTS_PER_PAGE; ++i){
@@ -2104,7 +2104,7 @@ public:
} }
// Hide the prev button and populate the first page // Hide the prev button and populate the first page
doSelectPage(0); changeSelectedPage(0);
me.run(); me.run();
if(!me.hasResult()) return ""; if(!me.hasResult()) return "";