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

Display: removed redraw observer interface

Browse source 
This won't be needed once we get everything sorted out and refactored.
This commit is contained in:
Charles Dang 2018-03-23 12:23:58 +11:00
parent 8179c7226b
commit b6c4f0f6ae
3 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/display.cpp
View file

@ -139,7 +139,6 @@ display::display(const display_context* dc,
, drawn_hexes_(0)
, idle_anim_(preferences::idle_anim())
, idle_anim_rate_(1.0)
, redraw_observers_()
, draw_coordinates_(false)
, draw_terrain_codes_(false)
, draw_num_of_bitmaps_(false)
@ -2146,14 +2145,6 @@ void display::draw()
// events::raise_volatile_draw_event();
// events::raise_volatile_undraw_event();
// Call any redraw observers.
// FIXME: makes the editor slow.
#if 0
for(std::function<void(display&)> f : redraw_observers_) {
f(*this);
}
#endif
// Execute any post-draw actions from derived classes.
post_draw();
}

14
src/display.hpp
View file

@ -495,18 +495,6 @@ public:
/** Capture a (map-)screenshot into a surface. */
surface screenshot(bool map_screenshot = false);
/** Adds a redraw observer, a function object to be called when redraw_everything is used */
void add_redraw_observer(std::function<void(display&)> f)
{
redraw_observers_.push_back(f);
}
/** Clear the redraw observers */
void clear_redraw_observers()
{
redraw_observers_.clear();
}
theme& get_theme()
{
return theme_;
@ -1037,8 +1025,6 @@ private:
bool idle_anim_;
double idle_anim_rate_;
std::vector<std::function<void(display&)>> redraw_observers_;
/** Debug flag - overlay x,y coords on tiles */
bool draw_coordinates_;

2
src/editor/controller/editor_controller.cpp
View file

@ -94,7 +94,7 @@ void editor_controller::init_gui()
{
gui_->change_display_context(&get_current_map_context());
preferences::set_preference_display_settings();
gui_->add_redraw_observer(std::bind(&editor_controller::display_redraw_callback, this, _1));
//gui_->add_redraw_observer(std::bind(&editor_controller::display_redraw_callback, this, _1));
floating_label_manager_.reset(new font::floating_label_context());
gui().set_draw_coordinates(preferences::editor::draw_hex_coordinates());
gui().set_draw_terrain_codes(preferences::editor::draw_terrain_codes());