mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-17 04:16:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_ppa_build_failure_ButtonDefinition' into 'master'

Browse source 
Fix PPA GCC-15 build failure with ButtonDefinition

See merge request OpenMW/openmw!4837
This commit is contained in:
Alexei Kotov 2025-08-07 21:13:27 +03:00
commit b5f87a9d50
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,9 +48,9 @@ namespace MWGui
for (size_t i = 0; i < mButtons.size(); i++) for (size_t i = 0; i < mButtons.size(); i++)
{ {
getWidget(mButtons[i].mImage, "Btn" + sButtonDefs[i].mName + "Image"); getWidget(mButtons[i].mImage, "Btn" + std::string(sButtonDefs[i].mName) + "Image");
getWidget(mButtons[i].mText, "Btn" + sButtonDefs[i].mName + "Text"); getWidget(mButtons[i].mText, "Btn" + std::string(sButtonDefs[i].mName) + "Text");
getWidget(mButtons[i].mHBox, "Btn" + sButtonDefs[i].mName); getWidget(mButtons[i].mHBox, "Btn" + std::string(sButtonDefs[i].mName));
if (sButtonDefs[i].mInputType == InputType_Axis) if (sButtonDefs[i].mInputType == InputType_Axis)
setIcon(mButtons[i].mImage, inputMgr->getControllerAxisIcon(sButtonDefs[i].mId.mAxis)); setIcon(mButtons[i].mImage, inputMgr->getControllerAxisIcon(sButtonDefs[i].mId.mAxis));

3
apps/openmw/mwgui/controllerbuttonsoverlay.hpp
View file

@ -2,6 +2,7 @@
#define MWGUI_CONTROLLERBUTTONSOVERLAY_H #define MWGUI_CONTROLLERBUTTONSOVERLAY_H
#include <array> #include <array>
#include <string_view>
#include <MyGUI_ImageBox.h> #include <MyGUI_ImageBox.h>
#include <MyGUI_TextBox.h> #include <MyGUI_TextBox.h>
@ -49,7 +50,7 @@ namespace MWGui
struct ButtonDefinition struct ButtonDefinition
{ {
Button mButton; Button mButton;
std::string mName; std::string_view mName;
InputType mInputType; InputType mInputType;
union union
{ {