teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Made LineInfo a struct, as requested by Scrawl.

Browse source
This commit is contained in:
dteviot 2015-04-05 14:56:29 +12:00
parent 52de622e97
commit fe69dc2863
2 changed files with 41 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
apps/openmw/mwgui/spellview.cpp
View file

@ -12,6 +12,14 @@ namespace MWGui
const char* SpellView::sSpellModelIndex = "SpellModelIndex"; const char* SpellView::sSpellModelIndex = "SpellModelIndex";
SpellView::LineInfo::LineInfo(MyGUI::Widget* leftWidget, MyGUI::Widget* rightWidget, SpellModel::ModelIndex spellIndex)
: mLeftWidget(leftWidget)
, mRightWidget(rightWidget)
, mSpellIndex(spellIndex)
{
}
SpellView::SpellView() SpellView::SpellView()
: mShowCostColumn(true) : mShowCostColumn(true)
, mHighlightSelected(true) , mHighlightSelected(true)
@ -115,10 +123,10 @@ namespace MWGui
group.push_back(costChance); group.push_back(costChance);
Gui::SharedStateButton::createButtonGroup(group); Gui::SharedStateButton::createButtonGroup(group);
mLines.push_back(boost::make_tuple(t, costChance, true)); mLines.push_back(LineInfo(t, costChance, i));
} }
else else
mLines.push_back(boost::make_tuple(t, (MyGUI::Widget*)NULL, true)); mLines.push_back(LineInfo(t, (MyGUI::Widget*)NULL, i));
t->setStateSelected(spell.mSelected); t->setStateSelected(spell.mSelected);
} }
@ -139,13 +147,13 @@ namespace MWGui
for (std::vector< LineInfo >::iterator it = mLines.begin(); it != mLines.end(); ++it) for (std::vector< LineInfo >::iterator it = mLines.begin(); it != mLines.end(); ++it)
{ {
// only update the lines that are "updateable" // only update the lines that are "updateable"
if (it->get<2>()) SpellModel::ModelIndex spellIndex(it->mSpellIndex);
if (spellIndex != NoSpellIndex)
{ {
Gui::SharedStateButton* nameButton = reinterpret_cast<Gui::SharedStateButton*>(it->get<0>()); Gui::SharedStateButton* nameButton = reinterpret_cast<Gui::SharedStateButton*>(it->mLeftWidget);
// match model against line // match model against line
// if don't match, then major change has happened, so do a full update // if don't match, then major change has happened, so do a full update
SpellModel::ModelIndex spellIndex = getSpellModelIndex(nameButton);
if (mModel->getItemCount() <= static_cast<unsigned>(spellIndex)) if (mModel->getItemCount() <= static_cast<unsigned>(spellIndex))
{ {
fullUpdateRequired = true; fullUpdateRequired = true;
@ -162,7 +170,7 @@ namespace MWGui
else else
{ {
maxSpellIndexFound = spellIndex; maxSpellIndexFound = spellIndex;
Gui::SharedStateButton* costButton = reinterpret_cast<Gui::SharedStateButton*>(it->get<1>()); Gui::SharedStateButton* costButton = reinterpret_cast<Gui::SharedStateButton*>(it->mRightWidget);
if ((costButton != NULL) && (costButton->getCaption() != spell.mCostColumn)) if ((costButton != NULL) && (costButton->getCaption() != spell.mCostColumn))
{ {
costButton->setCaption(spell.mCostColumn); costButton->setCaption(spell.mCostColumn);
@ -187,7 +195,7 @@ namespace MWGui
for (std::vector< LineInfo >::iterator it = mLines.begin(); for (std::vector< LineInfo >::iterator it = mLines.begin();
it != mLines.end(); ++it) it != mLines.end(); ++it)
{ {
height += (it->get<0>())->getHeight(); height += (it->mLeftWidget)->getHeight();
} }
bool scrollVisible = height > mScrollView->getHeight(); bool scrollVisible = height > mScrollView->getHeight();
@ -197,14 +205,14 @@ namespace MWGui
for (std::vector< LineInfo >::iterator it = mLines.begin(); for (std::vector< LineInfo >::iterator it = mLines.begin();
it != mLines.end(); ++it) it != mLines.end(); ++it)
{ {
int lineHeight = (it->get<0>())->getHeight(); int lineHeight = (it->mLeftWidget)->getHeight();
(it->get<0>())->setCoord(4, height, width - 8, lineHeight); (it->mLeftWidget)->setCoord(4, height, width - 8, lineHeight);
if (it->get<1>()) if (it->mRightWidget)
{ {
(it->get<1>())->setCoord(4, height, width - 8, lineHeight); (it->mRightWidget)->setCoord(4, height, width - 8, lineHeight);
MyGUI::TextBox* second = (it->get<1>())->castType<MyGUI::TextBox>(false); MyGUI::TextBox* second = (it->mRightWidget)->castType<MyGUI::TextBox>(false);
if (second) if (second)
(it->get<0>())->setSize(width - 8 - second->getTextSize().width, lineHeight); (it->mLeftWidget)->setSize(width - 8 - second->getTextSize().width, lineHeight);
} }
height += lineHeight; height += lineHeight;
@ -224,7 +232,7 @@ namespace MWGui
MyGUI::IntCoord(0, 0, mScrollView->getWidth(), 18), MyGUI::IntCoord(0, 0, mScrollView->getWidth(), 18),
MyGUI::Align::Left | MyGUI::Align::Top); MyGUI::Align::Left | MyGUI::Align::Top);
separator->setNeedMouseFocus(false); separator->setNeedMouseFocus(false);
mLines.push_back(boost::make_tuple(separator, (MyGUI::Widget*)NULL, false)); mLines.push_back(LineInfo(separator, (MyGUI::Widget*)NULL, NoSpellIndex));
} }
MyGUI::TextBox* groupWidget = mScrollView->createWidget<MyGUI::TextBox>("SandBrightText", MyGUI::TextBox* groupWidget = mScrollView->createWidget<MyGUI::TextBox>("SandBrightText",
@ -243,10 +251,10 @@ namespace MWGui
groupWidget2->setTextAlign(MyGUI::Align::Right); groupWidget2->setTextAlign(MyGUI::Align::Right);
groupWidget2->setNeedMouseFocus(false); groupWidget2->setNeedMouseFocus(false);
mLines.push_back(boost::make_tuple(groupWidget, groupWidget2, false)); mLines.push_back(LineInfo(groupWidget, groupWidget2, NoSpellIndex));
} }
else else
mLines.push_back(boost::make_tuple(groupWidget, (MyGUI::Widget*)NULL, false)); mLines.push_back(LineInfo(groupWidget, (MyGUI::Widget*)NULL, NoSpellIndex));
} }

22
apps/openmw/mwgui/spellview.hpp
View file

@ -56,11 +56,23 @@ namespace MWGui
std::auto_ptr<SpellModel> mModel; std::auto_ptr<SpellModel> mModel;
/// tracks an item in the spell view /// tracks a row in the spell view
/// element<0> is the left column GUI object (usually holds the name) struct LineInfo
/// element<1> is the right column (charge or cost info) {
/// element<2> is if line needs to be checked during incremental update /// the widget on the left side of the row
typedef boost::tuple<MyGUI::Widget*, MyGUI::Widget*, bool> LineInfo; MyGUI::Widget* mLeftWidget;
/// the widget on the left side of the row (if there is one)
MyGUI::Widget* mRightWidget;
/// index to item in mModel that row is showing information for
SpellModel::ModelIndex mSpellIndex;
LineInfo(MyGUI::Widget* leftWidget, MyGUI::Widget* rightWidget, SpellModel::ModelIndex spellIndex);
};
/// magic number indicating LineInfo does not correspond to an item in mModel
enum { NoSpellIndex = -1 };
std::vector< LineInfo > mLines; std::vector< LineInfo > mLines;