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

Move fix for #13522 to ui

Browse source 
More layout optimisation for the create screen.
This commit is contained in:
Jon Daniel 2005-08-01 20:36:12 +00:00
parent d899d24f97
commit f7122ed200
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/multiplayer_create.cpp
View file

@ -43,7 +43,7 @@ create::create(display& disp, const config &cfg, chat& c, config& gamelist) :
village_gold_label_(disp.video(), "", font::SIZE_SMALL, font::LOBBY_COLOUR),
xp_modifier_slider_(disp.video()),
xp_modifier_label_(disp.video(), "", font::SIZE_SMALL, font::LOBBY_COLOUR),
name_entry_label_(disp.video(), _("Name of game:"), font::SIZE_SMALL, font::LOBBY_COLOUR),
name_entry_label_(disp.video(), _("Name of game:"), font::SIZE_PLUS, font::LOBBY_COLOUR),
num_players_label_(disp.video(), "", font::SIZE_SMALL, font::LOBBY_COLOUR),
era_label_(disp.video(), _("Era:"), font::SIZE_SMALL, font::LOBBY_COLOUR),
map_label_(disp.video(), _("Map to play:"), font::SIZE_SMALL, font::LOBBY_COLOUR),
@ -402,10 +402,9 @@ void create::layout_children(const SDL_Rect& rect)
// Name Entry
name_entry_label_.set_location(xpos, ypos);
ypos += name_entry_label_.height() + border_size;
name_entry_.set_location(xpos, ypos);
name_entry_.set_width(ca.w);
ypos += name_entry_.height() + border_size;
name_entry_.set_location(xpos + name_entry_label_.width() + border_size, ypos);
name_entry_.set_width(ca.w - name_entry_label_.width() - border_size);
ypos += maximum<int>(name_entry_.height(), name_entry_label_.height()) + border_size;
// Save ypos here (column top)
int ypos_columntop = ypos;

2
src/multiplayer_lobby.cpp
View file

@ -113,8 +113,6 @@ lobby::lobby(display& disp, const config& cfg, chat& c, config& gamelist) :
current_game_(0)
{
game_config::debug = false;
const SDL_Rect pos = { 0, 0, disp.video().getx(), disp.video().gety() };
ui::set_location(pos);
gamelist_updated();
}

2
src/multiplayer_ui.cpp
View file

@ -166,6 +166,8 @@ ui::ui(display& disp, const std::string& title, const config& cfg, chat& c, conf
result_(CONTINUE)
{
const SDL_Rect area = { 0, 0, disp.video().getx(), disp.video().gety() };
set_location(area);
}
void ui::process_network()