ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #1499

Browse Source
This commit is contained in:
Marianne Gagnon 2014-09-06 17:58:59 -04:00
parent 27306018d5
commit 016ba2caf3
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/guiengine/widgets/ribbon_widget.cpp
View File

@ -722,15 +722,21 @@ EventPropagation RibbonWidget::transmitEvent(Widget* w,
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void RibbonWidget::setLabel(const unsigned int id, irr::core::stringw new_name) void RibbonWidget::setLabel(const unsigned int id, irr::core::stringw new_name)
{ {
// This method should only be called AFTER a widget is added if (m_element == NULL)
assert(m_element != NULL); {
// before adding
m_children[id].setText(new_name);
}
else
{
// after adding
// ignore this call for ribbons without labels
if (m_labels.size() == 0) return;
// ignore this call for ribbons without labels assert(id < m_labels.size());
if (m_labels.size() == 0) return; m_labels[id].setText(new_name.c_str());
//m_text = new_name;
assert(id < m_labels.size()); }
m_labels[id].setText( new_name.c_str() );
m_text = new_name;
} // setLabel } // setLabel
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
src/states_screens/gp_info_screen.cpp
View File

@ -134,12 +134,14 @@ void GPInfoScreen::beforeAddingWidget()
RibbonWidget* ribbonButtons = getWidget<RibbonWidget>("buttons"); RibbonWidget* ribbonButtons = getWidget<RibbonWidget>("buttons");
int id_continue_button = ribbonButtons->findItemNamed("continue"); int id_continue_button = ribbonButtons->findItemNamed("continue");
ribbonButtons->setItemVisible(id_continue_button, saved_gp != NULL); ribbonButtons->setItemVisible(id_continue_button, saved_gp != NULL);
ribbonButtons->setLabel(id_continue_button, _("Continue saved GP"));
} }
else else
{ {
RibbonWidget* ribbonButtons = getWidget<RibbonWidget>("buttons"); RibbonWidget* ribbonButtons = getWidget<RibbonWidget>("buttons");
int id_continue_button = ribbonButtons->findItemNamed("continue"); int id_continue_button = ribbonButtons->findItemNamed("continue");
ribbonButtons->setItemVisible(id_continue_button, true); ribbonButtons->setItemVisible(id_continue_button, true);
ribbonButtons->setLabel(id_continue_button, _("Reload"));
} }
} }