mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-01 22:04:31 +00:00
Code Issues Releases Wiki Activity

Allow controller to select choice text in dialogue

Browse source
This commit is contained in:
Andrew Lanzone 2025-05-20 00:12:34 -07:00
parent f36401438f
commit f03f242e4a
4 changed files with 55 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/bookpage.cpp
View file

@ -1288,6 +1288,12 @@ namespace MWGui
void unadviseLinkClicked() override { mPageDisplay->mLinkClicked = std::function<void(InteractiveId)>(); } void unadviseLinkClicked() override { mPageDisplay->mLinkClicked = std::function<void(InteractiveId)>(); }
void setFocusItem(BookTypesetter::Style* itemStyle) override
{
mPageDisplay->mFocusItem = (TypesetBookImpl::StyleImpl*)itemStyle;
mPageDisplay->dirtyFocusItem();
}
protected: protected:
void initialiseOverride() override void initialiseOverride() override
{ {

2
apps/openmw/mwgui/bookpage.hpp
View file

@ -164,6 +164,8 @@ namespace MWGui
/// Register the widget and associated sub-widget with MyGUI. Should be /// Register the widget and associated sub-widget with MyGUI. Should be
/// called once near the beginning of the program. /// called once near the beginning of the program.
static void registerMyGUIComponents(); static void registerMyGUIComponents();
virtual void setFocusItem(BookTypesetter::Style* itemStyle) = 0;
}; };
} }

64
apps/openmw/mwgui/dialogue.cpp
View file

@ -691,6 +691,8 @@ namespace MWGui
// choices // choices
const TextColours& textColours = MWBase::Environment::get().getWindowManager()->getTextColours(); const TextColours& textColours = MWBase::Environment::get().getWindowManager()->getTextColours();
mChoices = MWBase::Environment::get().getDialogueManager()->getChoices(); mChoices = MWBase::Environment::get().getDialogueManager()->getChoices();
mChoiceStyles.clear();
mControllerChoice = -1; // -1 so you must make a choice (and can't accidentally pick the first answer)
for (std::pair<std::string, int>& choice : mChoices) for (std::pair<std::string, int>& choice : mChoices)
{ {
auto link = std::make_unique<Choice>(choice.second); auto link = std::make_unique<Choice>(choice.second);
@ -702,6 +704,7 @@ namespace MWGui
BookTypesetter::Style* questionStyle = typesetter->createHotStyle( BookTypesetter::Style* questionStyle = typesetter->createHotStyle(
body, textColours.answer, textColours.answerOver, textColours.answerPressed, interactiveId); body, textColours.answer, textColours.answerOver, textColours.answerPressed, interactiveId);
typesetter->write(questionStyle, to_utf8_span(choice.first)); typesetter->write(questionStyle, to_utf8_span(choice.first));
mChoiceStyles.push_back(questionStyle);
} }
mGoodbye = MWBase::Environment::get().getDialogueManager()->isGoodbye(); mGoodbye = MWBase::Environment::get().getDialogueManager()->isGoodbye();
@ -944,7 +947,12 @@ namespace MWGui
{ {
if (arg.button == SDL_CONTROLLER_BUTTON_A) if (arg.button == SDL_CONTROLLER_BUTTON_A)
{ {
if (mControllerFocus == mTopicsList->getItemCount()) if (mChoices.size() > 0)
{
if (mControllerChoice >= 0 && mControllerChoice < mChoices.size())
onChoiceActivated(mControllerChoice + 1); // +1 because choices are indexed starting at 1
}
else if (mControllerFocus == mTopicsList->getItemCount())
onGoodbyeActivated(); onGoodbyeActivated();
else else
onSelectListItem(mTopicsList->getItemNameAt(mControllerFocus), mControllerFocus); onSelectListItem(mTopicsList->getItemNameAt(mControllerFocus), mControllerFocus);
@ -955,29 +963,47 @@ namespace MWGui
} }
else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_UP) else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_UP)
{ {
// Number of items is mTopicsList.length+1 because of "Goodbye" button. if (mChoices.size() > 0)
setControllerFocus(mControllerFocus, false); {
if (mControllerFocus <= 0) // In-dialogue choice (red text)
mControllerFocus = mTopicsList->getItemCount(); mControllerChoice = std::clamp(mControllerChoice - 1, 0, (int)mChoices.size() - 1);
else if (mTopicsList->getItemNameAt(mControllerFocus - 1).length() == 0) mHistory->setFocusItem(mChoiceStyles.at(mControllerChoice));
mControllerFocus -= 2; // Skip separator }
else else
mControllerFocus--; {
setControllerFocus(mControllerFocus, true); // Number of items is mTopicsList.length+1 because of "Goodbye" button.
setControllerFocus(mControllerFocus, false);
if (mControllerFocus <= 0)
mControllerFocus = mTopicsList->getItemCount(); // "Goodbye" button
else if (mTopicsList->getItemNameAt(mControllerFocus - 1).length() == 0)
mControllerFocus -= 2; // Skip separator
else
mControllerFocus--;
setControllerFocus(mControllerFocus, true);
}
} }
else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_DOWN) else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_DOWN)
{ {
// Number of items is mTopicsList.length+1 because of "Goodbye" button. if (mChoices.size() > 0)
setControllerFocus(mControllerFocus, false); {
if (mControllerFocus >= mTopicsList->getItemCount()) // In-dialogue choice (red text)
mControllerFocus = 0; mControllerChoice = std::clamp(mControllerChoice + 1, 0, (int)mChoices.size() - 1);
else if (mControllerFocus == mTopicsList->getItemCount() - 1) mHistory->setFocusItem(mChoiceStyles.at(mControllerChoice));
mControllerFocus = mTopicsList->getItemCount(); }
else if (mTopicsList->getItemNameAt(mControllerFocus + 1).length() == 0)
mControllerFocus += 2; // Skip separator
else else
mControllerFocus++; {
setControllerFocus(mControllerFocus, true); // Number of items is mTopicsList.length+1 because of "Goodbye" button.
setControllerFocus(mControllerFocus, false);
if (mControllerFocus >= mTopicsList->getItemCount())
mControllerFocus = 0;
else if (mControllerFocus == mTopicsList->getItemCount() - 1)
mControllerFocus = mTopicsList->getItemCount(); // "Goodbye" button
else if (mTopicsList->getItemNameAt(mControllerFocus + 1).length() == 0)
mControllerFocus += 2; // Skip separator
else
mControllerFocus++;
setControllerFocus(mControllerFocus, true);
}
} }
return true; return true;

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

@ -205,6 +205,7 @@ namespace MWGui
std::vector<std::unique_ptr<DialogueText>> mHistoryContents; std::vector<std::unique_ptr<DialogueText>> mHistoryContents;
std::vector<std::pair<std::string, int>> mChoices; std::vector<std::pair<std::string, int>> mChoices;
std::vector<BookTypesetter::Style*> mChoiceStyles;
bool mGoodbye; bool mGoodbye;
std::vector<std::unique_ptr<Link>> mLinks; std::vector<std::unique_ptr<Link>> mLinks;
@ -230,6 +231,7 @@ namespace MWGui
void setControllerFocus(int index, bool focused); void setControllerFocus(int index, bool focused);
int mControllerFocus = 0; int mControllerFocus = 0;
int mControllerChoice = -1;
void updateTopicFormat(); void updateTopicFormat();
}; };