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

Display: removed more theme handling stuff

Browse source
This commit is contained in:
Charles Dang 2018-03-22 14:46:34 +11:00
parent 75954109c5
commit 4ea25d5df5
4 changed files with 6 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/controller_base.cpp
View file

@ -263,6 +263,7 @@ void controller_base::play_slice(bool is_delay_enabled)
l->update();
}
#if 0
const theme::menu* const m = get_display().menu_pressed();
if(m != nullptr) {
const SDL_Rect& menu_loc = m->location(get_display().video().screen_area());
@ -278,6 +279,7 @@ void controller_base::play_slice(bool is_delay_enabled)
return;
}
#endif
auto str_vec = additional_actions_pressed();
if(!str_vec.empty()) {

75
src/display.cpp
View file

@ -168,8 +168,6 @@ display::display(const display_context * dc, std::weak_ptr<wb::manager> wb, cons
, fps_counter_()
, fps_start_()
, fps_actual_()
, menu_buttons_()
, action_buttons_()
, mouseover_hex_overlay_(nullptr)
, tod_hex_mask1(nullptr)
, tod_hex_mask2(nullptr)
@ -233,8 +231,7 @@ display::~display()
}
void display::set_theme(config theme_cfg) {
theme_ = theme(theme_cfg, video_.screen_area()); menu_buttons_.clear();
action_buttons_.clear();
theme_ = theme(theme_cfg, video_.screen_area());
}
void display::init_flags() {
@ -457,7 +454,6 @@ bool display::is_blindfolded() const
return blindfold_ctr_ > 0;
}
const SDL_Rect& display::max_map_area() const
{
static SDL_Rect max_area {0, 0, 0, 0};
@ -525,7 +521,6 @@ const map_location display::hex_clicked_on(int xclick, int yclick) const
return pixel_position_to_hex(xpos_ + xclick, ypos_ + yclick);
}
// This function uses the rect of map_area as reference
const map_location display::pixel_position_to_hex(int x, int y) const
{
@ -763,28 +758,14 @@ surface display::screenshot(bool map_screenshot)
return res;
}
std::shared_ptr<gui::button> display::find_action_button(const std::string& id)
std::shared_ptr<gui::button> display::find_action_button(const std::string& /*id*/)
{
return nullptr;
for (std::size_t i = 0; i < action_buttons_.size(); ++i) {
if(action_buttons_[i]->id() == id) {
return action_buttons_[i];
}
}
return nullptr;
}
std::shared_ptr<gui::button> display::find_menu_button(const std::string& id)
std::shared_ptr<gui::button> display::find_menu_button(const std::string& /*id*/)
{
return nullptr;
for (std::size_t i = 0; i < menu_buttons_.size(); ++i) {
if(menu_buttons_[i]->id() == id) {
return menu_buttons_[i];
}
}
return nullptr;
}
static const std::string& get_direction(std::size_t n)
@ -1015,56 +996,6 @@ void display::set_diagnostic(const std::string& msg)
}
}
const theme::action* display::action_pressed()
{
for(auto i = action_buttons_.begin(); i != action_buttons_.end(); ++i) {
if((*i)->pressed()) {
const std::size_t index = std::distance(action_buttons_.begin(), i);
if(index >= theme_.actions().size()) {
assert(false);
return nullptr;
}
return &theme_.actions()[index];
}
}
return nullptr;
}
const theme::menu* display::menu_pressed()
{
for(auto i = menu_buttons_.begin(); i != menu_buttons_.end(); ++i) {
if((*i)->pressed()) {
const std::size_t index = std::distance(menu_buttons_.begin(), i);
if(index >= theme_.menus().size()) {
assert(false);
return nullptr;
}
return theme_.get_menu_item((*i)->id());
}
}
return nullptr;
}
void display::enable_menu(const std::string& item, bool enable)
{
for(auto menu = theme_.menus().begin(); menu != theme_.menus().end(); ++menu) {
const auto hasitem = std::find_if(menu->items().begin(), menu->items().end(),
[&item](const config& c) { return c["id"].str() == item; }
);
if(hasitem != menu->items().end()) {
const std::size_t index = std::distance(theme_.menus().begin(), menu);
if(index >= menu_buttons_.size()) {
continue;
}
menu_buttons_[index]->enable(enable);
}
}
}
void display::announce(const std::string& message, const color_t& color, const announce_options& options)
{
if(options.discard_previous) {

10
src/display.hpp
View file

@ -568,15 +568,6 @@ public:
/** Rebuild all dynamic terrain. */
void rebuild_all();
const theme::action* action_pressed();
const theme::menu* menu_pressed();
/**
* Finds the menu which has a given item in it,
* and enables or disables it.
*/
void enable_menu(const std::string& item, bool enable);
void set_diagnostic(const std::string& msg);
/**
@ -992,7 +983,6 @@ protected:
uint32_t last_frame_finished_ = 0u;
// Not set by the initializer:
std::vector<std::shared_ptr<gui::button>> menu_buttons_, action_buttons_;
surface mouseover_hex_overlay_;
// If we're transitioning from one time of day to the next,
// then we will use these two masks on top of all hexes when we blit.

3
src/playsingle_controller.cpp
View file

@ -503,10 +503,9 @@ void playsingle_controller::linger()
void playsingle_controller::end_turn_enable(bool enable)
{
gui_->enable_menu("endturn", enable);
//gui_->enable_menu("endturn", enable);
}
void playsingle_controller::after_human_turn()
{
// Clear moves from the GUI.