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

Editor: fixed ToD setting having no visible effect

Browse source
This commit is contained in:
Charles Dang 2017-04-18 18:55:26 +11:00
parent f43469e3c2
commit 94c9e5e604
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -640,7 +640,7 @@ bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int i
context_manager_->get_map_context().set_starting_time(index);
const tod_manager* tod = context_manager_->get_map_context().get_time_manager();
tod_color col = tod->times()[index].color;
image::set_color_adjustment(col.r, col.g, col.b);
gui_->adjust_color_overlay(col.r, col.g, col.b);
return true;
}
case LOCAL_TIME:
@ -666,7 +666,7 @@ bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int i
context_manager_->get_map_context().replace_schedule(iter->second.second);
const tod_manager* tod = context_manager_->get_map_context().get_time_manager();
tod_color col = tod->times()[0].color;
image::set_color_adjustment(col.r, col.g, col.b);
gui_->adjust_color_overlay(col.r, col.g, col.b);
return true;
}
case LOCAL_SCHEDULE:

10
src/gui/dialogs/editor/custom_tod.cpp
View file

@ -178,10 +178,6 @@ const time_of_day& custom_tod::get_selected_tod() const
void custom_tod::update_tod_display(window& window)
{
::image::set_color_adjustment(tod_red_field_->get_value(),
tod_green_field_->get_value(),
tod_blue_field_->get_value());
// 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.
@ -196,6 +192,12 @@ void custom_tod::update_tod_display(window& window)
// If this ceases to be the case in the future, you'll need to call
// redraw_everything() instead.
display_.adjust_color_overlay(
tod_red_field_->get_value(),
tod_green_field_->get_value(),
tod_blue_field_->get_value()
);
// invalidate all tiles so they are redrawn with the new ToD tint next
display_.invalidate_all();