AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-09 04:15:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with setControllerFocus

Browse Source
This commit is contained in:
Andrew Lanzone 2025-07-03 11:44:36 -07:00
parent 44fb923d7b
commit 5d8c349899
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/openmw/mwgui/dialogue.cpp
View File

@ -921,20 +921,20 @@ namespace MWGui
&& actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion"); && actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion");
} }
void DialogueWindow::setControllerFocus(int index, bool focused) void DialogueWindow::setControllerFocus(size_t index, bool focused)
{ {
// List is mTopicsList + "Goodbye" button below the list. // List is mTopicsList + "Goodbye" button below the list.
if (index < 0 || index > static_cast<int>(mTopicsList->getItemCount())) if (index < 0 || index > mTopicsList->getItemCount())
return; return;
if (index == static_cast<int>(mTopicsList->getItemCount())) if (index == mTopicsList->getItemCount())
{ {
mGoodbyeButton->setStateSelected(focused); mGoodbyeButton->setStateSelected(focused);
} }
else else
{ {
std::string keyword = mTopicsList->getItemNameAt(mControllerFocus); const std::string& keyword = mTopicsList->getItemNameAt(mControllerFocus);
if (keyword.length() == 0) if (keyword.empty())
return; return;
MyGUI::Button* button = mTopicsList->getItemWidget(keyword); MyGUI::Button* button = mTopicsList->getItemWidget(keyword);
@ -949,10 +949,10 @@ namespace MWGui
else else
{ {
int offset = 0; int offset = 0;
for (int i = 0; i < index - 8; i++) for (size_t i = 0; i < index - 8; i++)
{ {
std::string keyword = mTopicsList->getItemNameAt(i); const std::string& keyword = mTopicsList->getItemNameAt(i);
if (keyword.length() == 0) if (keyword.empty())
offset += 21; offset += 21;
else else
offset += mTopicsList->getItemWidget(keyword)->getHeight() + 3; offset += mTopicsList->getItemWidget(keyword)->getHeight() + 3;
@ -997,7 +997,7 @@ namespace MWGui
setControllerFocus(mControllerFocus, false); setControllerFocus(mControllerFocus, false);
if (mControllerFocus <= 0) if (mControllerFocus <= 0)
mControllerFocus = mTopicsList->getItemCount(); // "Goodbye" button mControllerFocus = mTopicsList->getItemCount(); // "Goodbye" button
else if (mTopicsList->getItemNameAt(mControllerFocus - 1).length() == 0) else if (mTopicsList->getItemNameAt(mControllerFocus - 1).empty())
mControllerFocus -= 2; // Skip separator mControllerFocus -= 2; // Skip separator
else else
mControllerFocus--; mControllerFocus--;
@ -1020,7 +1020,7 @@ namespace MWGui
mControllerFocus = 0; mControllerFocus = 0;
else if (mControllerFocus == static_cast<int>(mTopicsList->getItemCount()) - 1) else if (mControllerFocus == static_cast<int>(mTopicsList->getItemCount()) - 1)
mControllerFocus = mTopicsList->getItemCount(); // "Goodbye" button mControllerFocus = mTopicsList->getItemCount(); // "Goodbye" button
else if (mTopicsList->getItemNameAt(mControllerFocus + 1).length() == 0) else if (mTopicsList->getItemNameAt(mControllerFocus + 1).empty())
mControllerFocus += 2; // Skip separator mControllerFocus += 2; // Skip separator
else else
mControllerFocus++; mControllerFocus++;

2
apps/openmw/mwgui/dialogue.hpp
View File

@ -229,7 +229,7 @@ namespace MWGui
std::unique_ptr<ResponseCallback> mCallback; std::unique_ptr<ResponseCallback> mCallback;
std::unique_ptr<ResponseCallback> mGreetingCallback; std::unique_ptr<ResponseCallback> mGreetingCallback;
void setControllerFocus(int index, bool focused); void setControllerFocus(size_t index, bool focused);
int mControllerFocus = 0; int mControllerFocus = 0;
int mControllerChoice = -1; int mControllerChoice = -1;