[Wesnoth-cvs-commits] wesnoth/src multiplayer_lobby.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/09/13 14:15:26

Modified files:
        src            : multiplayer_lobby.cpp 

Log message:
        Fix ellipis stuff for name and map_info

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.88&tr2=1.89&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.88 
wesnoth/src/multiplayer_lobby.cpp:1.89
--- wesnoth/src/multiplayer_lobby.cpp:1.88      Tue Sep 13 13:45:31 2005
+++ wesnoth/src/multiplayer_lobby.cpp   Tue Sep 13 14:15:26 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_lobby.cpp,v 1.88 2005/09/13 13:45:31 j_daniel Exp $ */
+/* $Id: multiplayer_lobby.cpp,v 1.89 2005/09/13 14:15:26 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -113,13 +113,13 @@
 
        xpos += item_height_ + margin_;
 
-       const surface 
name_surf(font::get_rendered_text(font::make_text_ellipsis(game.name, 
font::SIZE_NORMAL, item_rect.w - xpos - margin_), font::SIZE_PLUS, 
game.vacant_slots > 0 ? font::GOOD_COLOUR : game.observers ? 
font::NORMAL_COLOUR : font::BAD_COLOUR));
+       const surface 
name_surf(font::get_rendered_text(font::make_text_ellipsis(game.name, 
font::SIZE_PLUS, (item_rect.x + item_rect.w) - xpos - margin_), 
font::SIZE_PLUS, game.vacant_slots > 0 ? font::GOOD_COLOUR : game.observers ? 
font::NORMAL_COLOUR : font::BAD_COLOUR));
        video().blit_surface(xpos, ypos, name_surf);
 
        ypos += v_padding_;
 
        // draw map info
-       const surface 
map_info_surf(font::get_rendered_text(font::make_text_ellipsis(game.map_info, 
font::SIZE_NORMAL, item_rect.w - xpos - margin_), font::SIZE_PLUS, 
font::GOOD_COLOUR));
+       const surface 
map_info_surf(font::get_rendered_text(font::make_text_ellipsis(game.map_info, 
font::SIZE_PLUS, (item_rect.x + item_rect.w) - xpos - margin_), 
font::SIZE_PLUS, font::GOOD_COLOUR));
        video().blit_surface(xpos, ypos, map_info_surf);