0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the gui1 menu displaying the wrong help when the list got sorted.

Browse source 
Avoid drawing the help when the menu is hidden.
This commit is contained in:
Fabian Müller 2012-09-23 09:38:27 +00:00
parent 218f1c4e45
commit f1640860f8
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/widgets/menu.cpp
View file

@ -1181,6 +1181,8 @@ size_t menu::get_item_height(int) const
void menu::process_help_string(int mousex, int mousey)
{
if (hidden()) return;
const std::pair<int,int> loc(hit(mousex,mousey), hit_column(mousex));
if(loc == cur_help_) {
return;
@ -1193,7 +1195,7 @@ void menu::process_help_string(int mousex, int mousey)
help_string_ = -1;
}
if(size_t(loc.first) < items_.size()) {
const std::vector<std::string>& row = items_[loc.first].help;
const std::vector<std::string>& row = items_[item_pos_[loc.first]].help;
if(size_t(loc.second) < row.size()) {
const std::string& help = row[loc.second];
if(help.empty() == false) {