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

Fix icons of buttons under the minimap disappearing on closing a menu

Browse source
This commit is contained in:
Jyrki Vesterinen 2016-08-21 21:30:48 +03:00
parent d6e4c5dc0a
commit 8816dc9cd9
4 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -70,6 +70,8 @@ Version 1.13.5+dev:
* Added a tab to run the wmlxgettext tool to GUI.pyw
* Fixed problem with Spectre's hitpoint bar positioning.
* Show correct number of attacks in case of swarm weapon special (bug #24978)
* Fixed bug that icons of buttons under the minimap disappeared when the player opened
and closed a menu.
Version 1.13.5:
* Campaigns:

2
players_changelog
View file

@ -21,6 +21,8 @@ Version 1.13.5+dev:
* Miscellaneous and bug fixes:
* Fixed a stray ; character appearing pre-entered in the command console.
* Show correct number of attacks in case of swarm weapon special (bug #24978)
* Fixed bug that icons of buttons under the minimap disappeared when the player opened
and closed a menu.
Version 1.13.5:
* Campaigns:

10
src/controller_base.hpp
View file

@ -70,6 +70,11 @@ public:
void set_scroll_down(bool on);
void set_scroll_left(bool on);
void set_scroll_right(bool on);
/**
* Get (optionally) a command executor to handle context menu events
*/
virtual hotkey::command_executor * get_hotkey_command_executor() { return nullptr; }
protected:
virtual bool is_browsing() const
{ return false; }
@ -92,11 +97,6 @@ protected:
*/
virtual plugins_context * get_plugins_context() { return nullptr; }
/**
* Get (optionally) a command executor to handle context menu events
*/
virtual hotkey::command_executor * get_hotkey_command_executor() { return nullptr; }
/**
* Derived classes should override this to return false when arrow keys
* should not scroll the map, hotkeys not processed etc, for example

10
src/display.cpp
View file

@ -24,6 +24,7 @@
#include "game_preferences.hpp"
#include "gettext.hpp"
#include "halo.hpp"
#include "hotkey/command_executor.hpp"
#include "language.hpp"
#include "log.hpp"
#include "marked-up_text.hpp"
@ -2674,6 +2675,15 @@ void display::redraw_everything()
create_buttons();
}
hotkey::command_executor* command_executor =
resources::controller->get_hotkey_command_executor();
if (command_executor != nullptr)
{
// This function adds button overlays,
// it needs to be run after recreating the buttons.
command_executor->set_button_state();
}
panelsDrawn_ = false;
if (!gui::in_dialog()) {
labels().recalculate_labels();