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

GUI2/Window: reverted some unintentional semantic changes from 88e5c49f5d

Browse source 
These were never intended to go in that commit at all. I accidentally included them.
This reverts the semantic changes. The rest was just formatting so I'm leaving it.
This commit is contained in:
Charles Dang 2018-03-25 05:10:26 +11:00
parent e4b7820ab0
commit 8d3dcb109b
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gui/widgets/window.cpp
View file

@ -696,15 +696,12 @@ void window::layout()
log_scope2(log_gui_layout, LOG_SCOPE_HEADER);
point size = get_best_size();
const point mouse = get_mouse_position();
variables_.add("mouse_x", wfl::variant(mouse.x));
variables_.add("mouse_y", wfl::variant(mouse.y));
variables_.add("window_width", wfl::variant(0));
variables_.add("window_height", wfl::variant(0));
variables_.add("best_window_width", wfl::variant(size.x));
variables_.add("best_window_height", wfl::variant(size.y));
variables_.add("size_request_mode", wfl::variant("maximum"));
get_screen_size_variables(variables_);
@ -812,7 +809,7 @@ void window::layout()
}
/***** Get the best location for the window *****/
size = get_best_size();
point size = get_best_size();
assert(size.x <= maximum_width && size.y <= maximum_height);
point origin(0, 0);