[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src multiplayer_lobby.cpp multiplayer_u...
From: |
Jon Daniel |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src multiplayer_lobby.cpp multiplayer_u... |
Date: |
Mon, 01 Aug 2005 16:36:18 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jon Daniel <address@hidden> 05/08/01 20:36:18
Modified files:
src : multiplayer_lobby.cpp multiplayer_ui.cpp
multiplayer_create.cpp
Log message:
* Move fix for #13522 to ui
* More layout optimisation for the create screen.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.cpp.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.cpp.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
Patches:
Index: wesnoth/src/multiplayer_create.cpp
diff -u wesnoth/src/multiplayer_create.cpp:1.32
wesnoth/src/multiplayer_create.cpp:1.33
--- wesnoth/src/multiplayer_create.cpp:1.32 Mon Aug 1 07:34:38 2005
+++ wesnoth/src/multiplayer_create.cpp Mon Aug 1 20:36:12 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.cpp,v 1.32 2005/08/01 07:34:38 j_daniel Exp $ */
+/* $Id: multiplayer_create.cpp,v 1.33 2005/08/01 20:36:12 j_daniel Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -43,7 +43,7 @@
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 @@
// 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;
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.79
wesnoth/src/multiplayer_lobby.cpp:1.80
--- wesnoth/src/multiplayer_lobby.cpp:1.79 Mon Aug 1 18:10:37 2005
+++ wesnoth/src/multiplayer_lobby.cpp Mon Aug 1 20:36:11 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_lobby.cpp,v 1.79 2005/08/01 18:10:37 j_daniel Exp $ */
+/* $Id: multiplayer_lobby.cpp,v 1.80 2005/08/01 20:36:11 j_daniel Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -113,8 +113,6 @@
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();
}
Index: wesnoth/src/multiplayer_ui.cpp
diff -u wesnoth/src/multiplayer_ui.cpp:1.30 wesnoth/src/multiplayer_ui.cpp:1.31
--- wesnoth/src/multiplayer_ui.cpp:1.30 Wed Jul 20 08:22:37 2005
+++ wesnoth/src/multiplayer_ui.cpp Mon Aug 1 20:36:12 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.cpp,v 1.30 2005/07/20 08:22:37 ott Exp $ */
+/* $Id: multiplayer_ui.cpp,v 1.31 2005/08/01 20:36:12 j_daniel Exp $ */
/*
Copyright (C) 2005
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -166,6 +166,8 @@
result_(CONTINUE)
{
+ const SDL_Rect area = { 0, 0, disp.video().getx(), disp.video().gety()
};
+ set_location(area);
}
void ui::process_network()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src multiplayer_lobby.cpp multiplayer_u...,
Jon Daniel <=