wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor InventoryMenu to use control binding

Browse source
This commit is contained in:
Vsevolod Kremianskii 2021-06-18 08:24:02 +07:00
parent 59a990b5e2
commit 9e51780378
2 changed files with 101 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/engine/game/gui/ingame/inventory.cpp
View file

@ -18,6 +18,7 @@
#include "inventory.h"
#include "../../game.h"
#include "../../gameidutil.h"
#include "../colorutil.h"
@ -40,18 +41,54 @@ InventoryMenu::InventoryMenu(Game *game) : GameGUI(game) {
void InventoryMenu::load() {
GUI::load();
bindControls();
hideControl("BTN_CHARLEFT");
hideControl("BTN_CHARRIGHT");
hideControl("LBL_CREDITS_VALUE");
hideControl("LBL_VIT");
hideControl("LBL_DEF");
_binding.lblCreditsValue->setVisible(false);
_binding.btnUseItem->setDisabled(true);
_binding.btnQuestItems->setDisabled(true);
disableControl("BTN_USEITEM");
disableControl("BTN_QUESTITEMS");
if (isKotOR(_game->gameId())) {
_binding.lblVit->setVisible(false);
_binding.lblDef->setVisible(false);
_binding.btnChange1->setFocusable(false);
_binding.btnChange2->setFocusable(false);
}
}
setControlFocusable("BTN_CHANGE1", false);
setControlFocusable("BTN_CHANGE2", false);
void InventoryMenu::bindControls() {
_binding.btnExit = getControlPtr<Button>("BTN_EXIT");
_binding.btnQuestItems = getControlPtr<Button>("BTN_QUESTITEMS");
_binding.btnUseItem = getControlPtr<Button>("BTN_USEITEM");
_binding.lblCredits = getControlPtr<Label>("LBL_CREDITS");
_binding.lblCreditsValue = getControlPtr<Label>("LBL_CREDITS_VALUE");
_binding.lblInv = getControlPtr<Label>("LBL_INV");
_binding.lbDescription = getControlPtr<ListBox>("LB_DESCRIPTION");
_binding.lbItems = getControlPtr<ListBox>("LB_ITEMS");
if (isKotOR(_game->gameId())) {
_binding.btnChange1 = getControlPtr<Button>("BTN_CHANGE1");
_binding.btnChange2 = getControlPtr<Button>("BTN_CHANGE2");
_binding.lblBgPort = getControlPtr<Label>("LBL_BGPORT");
_binding.lblBgStats = getControlPtr<Label>("LBL_BGSTATS");
_binding.lblDef = getControlPtr<Label>("LBL_DEF");
_binding.lblPort = getControlPtr<Label>("LBL_PORT");
_binding.lblVit = getControlPtr<Label>("LBL_VIT");
} else {
_binding.btnAll = getControlPtr<Button>("BTN_ALL");
_binding.btnArmor = getControlPtr<Button>("BTN_ARMOR");
_binding.btnDatapads = getControlPtr<Button>("BTN_DATAPADS");
_binding.btnMisc = getControlPtr<Button>("BTN_MISC");
_binding.btnQuests = getControlPtr<Button>("BTN_QUESTS");
_binding.btnUseable = getControlPtr<Button>("BTN_USEABLE");
_binding.btnWeapons = getControlPtr<Button>("BTN_WEAPONS");
_binding.lblBar1 = getControlPtr<Label>("LBL_BAR1");
_binding.lblBar2 = getControlPtr<Label>("LBL_BAR2");
_binding.lblBar3 = getControlPtr<Label>("LBL_BAR3");
_binding.lblBar4 = getControlPtr<Label>("LBL_BAR4");
_binding.lblBar5 = getControlPtr<Label>("LBL_BAR5");
_binding.lblBar6 = getControlPtr<Label>("LBL_BAR6");
_binding.lblFilter = getControlPtr<Label>("LBL_FILTER");
}
}
void InventoryMenu::refreshPortraits() {
@ -62,16 +99,15 @@ void InventoryMenu::refreshPortraits() {
shared_ptr<Creature> partyMember1(party.getMember(1));
shared_ptr<Creature> partyMember2(party.getMember(2));
Control &lblPortrait = getControl("LBL_PORT");
lblPortrait.setBorderFill(partyLeader->portrait());
_binding.lblPort->setBorderFill(partyLeader->portrait());
Control &btnChange1 = getControl("BTN_CHANGE1");
btnChange1.setBorderFill(partyMember1 ? partyMember1->portrait() : nullptr);
btnChange1.setHilightFill(partyMember1 ? partyMember1->portrait() : nullptr);
if (isKotOR(_game->gameId())) {
_binding.btnChange1->setBorderFill(partyMember1 ? partyMember1->portrait() : nullptr);
_binding.btnChange1->setHilightFill(partyMember1 ? partyMember1->portrait() : nullptr);
Control &btnChange2 = getControl("BTN_CHANGE2");
btnChange2.setBorderFill(partyMember2 ? partyMember2->portrait() : nullptr);
btnChange2.setHilightFill(partyMember2 ? partyMember2->portrait() : nullptr);
_binding.btnChange2->setBorderFill(partyMember2 ? partyMember2->portrait() : nullptr);
_binding.btnChange2->setHilightFill(partyMember2 ? partyMember2->portrait() : nullptr);
}
}
void InventoryMenu::onClick(const string &control) {

48
src/engine/game/gui/ingame/inventory.h
View file

@ -21,6 +21,14 @@
namespace reone {
namespace gui {
class Button;
class Label;
class ListBox;
}
namespace game {
class InventoryMenu : public GameGUI {
@ -32,6 +40,46 @@ public:
void refreshPortraits();
private:
struct Binding {
std::shared_ptr<gui::Button> btnExit;
std::shared_ptr<gui::Button> btnQuestItems;
std::shared_ptr<gui::Button> btnUseItem;
std::shared_ptr<gui::Label> lblCredits;
std::shared_ptr<gui::Label> lblCreditsValue;
std::shared_ptr<gui::Label> lblInv;
std::shared_ptr<gui::ListBox> lbDescription;
std::shared_ptr<gui::ListBox> lbItems;
// KotOR only
std::shared_ptr<gui::Button> btnChange1;
std::shared_ptr<gui::Button> btnChange2;
std::shared_ptr<gui::Label> lblBgPort;
std::shared_ptr<gui::Label> lblBgStats;
std::shared_ptr<gui::Label> lblDef;
std::shared_ptr<gui::Label> lblPort;
std::shared_ptr<gui::Label> lblVit;
// END KotOR only
// TSL only
std::shared_ptr<gui::Button> btnAll;
std::shared_ptr<gui::Button> btnArmor;
std::shared_ptr<gui::Button> btnDatapads;
std::shared_ptr<gui::Button> btnMisc;
std::shared_ptr<gui::Button> btnQuests;
std::shared_ptr<gui::Button> btnUseable;
std::shared_ptr<gui::Button> btnWeapons;
std::shared_ptr<gui::Label> lblBar1;
std::shared_ptr<gui::Label> lblBar2;
std::shared_ptr<gui::Label> lblBar3;
std::shared_ptr<gui::Label> lblBar4;
std::shared_ptr<gui::Label> lblBar5;
std::shared_ptr<gui::Label> lblBar6;
std::shared_ptr<gui::Label> lblFilter;
// END TSL only
} _binding;
void bindControls();
void onClick(const std::string &control) override;
};