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

Rearrange some buttons to have a more logical order.

Browse source 
There's left a small glitch in 800x600 resolution (no space between
the "Action bonus" slider and the "Cancel" button). The alternative
would be to put the sliders for "Village gold" and "Experience
modifier" side by side, but that would look more ugly in higher
resolutions.
This commit is contained in:
uso 2007-08-19 21:01:22 +00:00
parent 124b7ee540
commit a117b4f0b7
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/multiplayer_create.cpp
View file

@ -693,7 +693,6 @@ void create::layout_children(const SDL_Rect& rect)
// Third column: big buch of options
ypos = ypos_columntop;
xpos += 200 + column_border_size;
turns_label_.set_location(xpos, ypos);
@ -715,11 +714,19 @@ void create::layout_children(const SDL_Rect& rect)
ypos += xp_modifier_slider_.height() + border_size;
use_map_settings_.set_location(xpos, ypos);
random_start_time_.set_location(xpos + (ca.w - xpos)/2 + 5, ypos);
fog_game_.set_location(xpos + (ca.w - xpos)/2 + 5, ypos);
ypos += use_map_settings_.height() + border_size;
observers_game_.set_location(xpos, ypos);
shroud_game_.set_location(xpos + (ca.w - xpos)/2 + 5, ypos);
ypos += observers_game_.height() + border_size;
countdown_game_.set_location(xpos, ypos);
random_start_time_.set_location(xpos + (ca.w - xpos)/2 + 5, ypos);
ypos += countdown_game_.height() + border_size;
countdown_init_time_label_.set_location(xpos, ypos);
countdown_turn_bonus_label_.set_location(xpos + (ca.w - xpos)/2 + 5 , ypos);
countdown_turn_bonus_label_.set_location(xpos + (ca.w - xpos)/2 + 5, ypos);
ypos += countdown_init_time_label_.height() + border_size;
countdown_init_time_slider_.set_width(((ca.w - xpos)/2)-5);
countdown_turn_bonus_slider_.set_width(((ca.w - xpos)/2)-5);
@ -728,7 +735,7 @@ void create::layout_children(const SDL_Rect& rect)
ypos += countdown_init_time_slider_.height() + border_size;
countdown_reservoir_time_label_.set_location(xpos, ypos);
countdown_action_bonus_label_.set_location(xpos + (ca.w - xpos)/2 + 5 , ypos);
countdown_action_bonus_label_.set_location(xpos + (ca.w - xpos)/2 + 5, ypos);
ypos += countdown_reservoir_time_label_.height() + border_size;
countdown_reservoir_time_slider_.set_width(((ca.w - xpos)/2)-5);
countdown_action_bonus_slider_.set_width(((ca.w - xpos)/2)-5);
@ -736,18 +743,6 @@ void create::layout_children(const SDL_Rect& rect)
countdown_action_bonus_slider_.set_location(xpos + (ca.w - xpos)/2 + 5, ypos);
ypos += countdown_reservoir_time_slider_.height() + border_size;
countdown_game_.set_location(xpos, ypos);
// ypos += countdown_game_.height() + border_size;
fog_game_.set_location(xpos + (ca.w - xpos)/2 + 5, ypos);
ypos += fog_game_.height() + border_size;
shroud_game_.set_location(xpos, ypos);
// ypos += shroud_game_.height() + border_size;
observers_game_.set_location(xpos + (ca.w - xpos)/2 + 5, ypos);
ypos += observers_game_.height() + border_size;
// OK / Cancel buttons
gui::button* left_button = &launch_game_;
gui::button* right_button = &cancel_game_;
@ -908,7 +903,6 @@ void create::layout_children(const SDL_Rect& rect)
left_button->set_location(xpos, ypos);
right_button->set_location(xpos + left_button->width() + 2 * border_size, ypos);
}