Skip to content

Commit

Permalink
GUI2/Window: removed empty undraw() function
Browse files Browse the repository at this point in the history
This was emptied earlier in my refactor when window unrendering was removed. I simply hadn't
removed the function yet.
  • Loading branch information
Vultraz committed Jul 9, 2017
1 parent e2677d7 commit f98c225
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 23 deletions.
15 changes: 5 additions & 10 deletions src/gui/dialogs/editor/custom_tod.cpp
Expand Up @@ -272,19 +272,14 @@ void custom_tod::color_slider_callback(window& window)
current_tod.color.g = color_field_g_->get_widget_value(window);
current_tod.color.b = color_field_b_->get_widget_value(window);

update_tod_display(window);
update_tod_display();
}

void custom_tod::update_tod_display(window& window)
void custom_tod::update_tod_display()
{
display* disp = display::get_singleton();
assert(disp && "Display pointer is null!");

// Prevent a floating slice of window appearing alone over the
// theme UI sidebar after redrawing tiles and before we have a
// chance to redraw the rest of this window.
window.undraw();

// NOTE: We only really want to re-render the gamemap tiles here.
// Redrawing everything is a significantly more expensive task.
// At this time, tiles are the only elements on which ToD tint is
Expand Down Expand Up @@ -331,17 +326,17 @@ void custom_tod::update_selected_tod_info(window& window)
const std::string new_index_str = formatter() << (current_tod_ + 1) << "/" << times_.size();
find_widget<label>(&window, "tod_number", false).set_label(new_index_str);

update_tod_display(window);
update_tod_display();
}

void custom_tod::copy_to_clipboard_callback(tod_attribute_getter getter)
{
desktop::clipboard::copy_to_clipboard(getter(get_selected_tod()).second, false);
}

void custom_tod::post_show(window& window)
void custom_tod::post_show(window& /*window*/)
{
update_tod_display(window);
update_tod_display();

if(get_retval() == window::OK) {
// TODO: save ToD
Expand Down
2 changes: 1 addition & 1 deletion src/gui/dialogs/editor/custom_tod.hpp
Expand Up @@ -65,7 +65,7 @@ class custom_tod : public modal_dialog

void color_slider_callback(window& window);

void update_tod_display(window& window);
void update_tod_display();

void update_lawful_bonus(window& window);

Expand Down
1 change: 0 additions & 1 deletion src/gui/dialogs/loading_screen.cpp
Expand Up @@ -103,7 +103,6 @@ loading_screen::loading_screen(std::function<void()> f)
void loading_screen::close()
{
if(window_) {
window_->undraw();
delete window_;
window_ = nullptr;
}
Expand Down
1 change: 0 additions & 1 deletion src/gui/dialogs/modeless_dialog.cpp
Expand Up @@ -69,7 +69,6 @@ void modeless_dialog::hide()
break;
}
}
window_->undraw();
delete window_;
window_ = nullptr;
}
Expand Down
5 changes: 0 additions & 5 deletions src/gui/widgets/window.cpp
Expand Up @@ -642,11 +642,6 @@ void window::draw()
}
}

void window::undraw()
{
// TODO: remove
}

window::invalidate_layout_blocker::invalidate_layout_blocker(window& window)
: window_(window)
{
Expand Down
5 changes: 0 additions & 5 deletions src/gui/widgets/window.hpp
Expand Up @@ -199,11 +199,6 @@ class window : public panel, public cursor::setter
*/
void draw();

/**
* Undraws the window.
*/
void undraw();

/**
* Adds an item to the dirty_list_.
*
Expand Down

0 comments on commit f98c225

Please sign in to comment.