mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-01-04 09:13:05 +00:00
Code Issues Releases Wiki Activity

bulk initialize controller focus to zero

Browse source
This commit is contained in:
bmdhacks 2025-08-11 17:08:17 -07:00
parent 1b34248ef6
commit 80a29ab57b
15 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/class.cpp
View file

@ -1021,8 +1021,8 @@ namespace MWGui
SelectSkillDialog::SelectSkillDialog()
: WindowModal("openmw_chargen_select_skill.layout")
, mSkillId(ESM::Skill::Block)
, mControllerFocus(0)
, mSkillId(ESM::Skill::Block)
, mNumSkillsPerSpecialization{}
{
// Centre dialog

0
apps/openmw/mwgui/class.h Normal file
View file

8
apps/openmw/mwgui/class.hpp
View file

@ -51,7 +51,7 @@ namespace MWGui
MyGUI::TextBox* mText;
MyGUI::Widget* mButtonBar;
std::vector<MyGUI::Button*> mButtons;
size_t mControllerFocus;
size_t mControllerFocus = 0;
};
// Lets the player choose between 3 ways of creating a class
@ -218,7 +218,7 @@ namespace MWGui
void onAttributeClicked(Widgets::MWAttributePtr _sender);
void onCancelClicked(MyGUI::Widget* _sender);
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
size_t mControllerFocus;
size_t mControllerFocus = 0;
std::vector<Widgets::MWAttribute*> mAttributeButtons;
private:
@ -252,7 +252,7 @@ namespace MWGui
void onSkillClicked(Widgets::MWSkillPtr _sender);
void onCancelClicked(MyGUI::Widget* _sender);
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
size_t mControllerFocus;
size_t mControllerFocus = 0;
std::vector<Widgets::MWSkill*> mSkillButtons;
private:
@ -353,7 +353,7 @@ namespace MWGui
Widgets::MWSkillPtr mAffectedSkill;
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
size_t mControllerFocus;
size_t mControllerFocus = 0;
};
}
#endif

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

@ -75,7 +75,7 @@ namespace MWGui
MyGUI::ScrollView* mScrollView;
DisplayMode mDisplayMode;
int mControllerFocus;
int mControllerFocus = 0;
void updateControllerFocus(int prevFocus, int newFocus);
};
}

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

@ -53,7 +53,7 @@ namespace MWGui
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
std::vector<MyGUI::Button*> mAttributeButtons;
size_t mControllerFocus;
size_t mControllerFocus = 0;
};
}

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

@ -225,7 +225,7 @@ namespace MWGui
MyGUI::Button* mDeleteButton;
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
int mControllerFocus;
int mControllerFocus = 0;
};
class MapWindow : public MWGui::WindowPinnableBase, public LocalMapBase, public NoDrop

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

@ -27,7 +27,7 @@ namespace MWGui
MWWorld::Ptr mActor;
size_t mControllerFocus;
size_t mControllerFocus = 0;
protected:
void onMouseWheel(MyGUI::Widget* _sender, int _rel);

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

@ -116,7 +116,7 @@ namespace MWGui
int mButtonPressed;
size_t mDefaultFocus;
bool mImmediate;
size_t mControllerFocus;
size_t mControllerFocus = 0;
};
}

2
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -40,7 +40,6 @@ namespace MWGui
, mKey(std::vector<keyData>(10))
, mSelected(nullptr)
, mActivated(nullptr)
, mControllerFocus(0)
{
getWidget(mOkButton, "OKButton");
getWidget(mInstructionLabel, "InstructionLabel");
@ -506,7 +505,6 @@ namespace MWGui
QuickKeysMenuAssign::QuickKeysMenuAssign(QuickKeysMenu* parent)
: WindowModal("openmw_quickkeys_menu_assign.layout")
, mParent(parent)
, mControllerFocus(0)
{
getWidget(mLabel, "Label");
getWidget(mItemButton, "ItemButton");

6
apps/openmw/mwgui/quickkeysmenu.hpp
View file

@ -75,7 +75,7 @@ namespace MWGui
void assignItem(MWWorld::Ptr item);
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
size_t mControllerFocus;
size_t mControllerFocus = 0;
};
class QuickKeysMenuAssign : public WindowModal
@ -93,7 +93,7 @@ namespace MWGui
QuickKeysMenu* mParent;
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
int mControllerFocus;
int mControllerFocus = 0;
};
class MagicSelectionDialog : public WindowModal
@ -114,7 +114,7 @@ namespace MWGui
void onModelIndexSelected(SpellModel::ModelIndex index);
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
int mControllerFocus;
int mControllerFocus = 0;
};
}

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

@ -104,7 +104,7 @@ namespace MWGui
// 0 = Name, 1 = Race, 2 = Class, 3 = BirthSign, 4 = Back, 5 = OK
std::vector<MyGUI::Button*> mButtons;
int mControllerFocus;
int mControllerFocus = 0;
};
}
#endif

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

@ -58,7 +58,7 @@ namespace MWGui
private:
static bool sortSpells(const ESM::Spell* left, const ESM::Spell* right);
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
size_t mControllerFocus;
size_t mControllerFocus = 0;
};
}

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

@ -94,7 +94,7 @@ namespace MWGui
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
void updateControllerFocus(int prevFocus, int newFocus);
int mControllerFocus;
int mControllerFocus = 0;
std::vector<MyGUI::TextBox*> mButtons;
};

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

@ -55,7 +55,7 @@ namespace MWGui
TimeAdvancer mTimeAdvancer;
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
size_t mControllerFocus;
size_t mControllerFocus = 0;
};
}

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

@ -42,7 +42,7 @@ namespace MWGui
private:
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
size_t mControllerFocus;
size_t mControllerFocus = 0;
};
}