[Wesnoth-cvs-commits] wesnoth/src dialogs.cpp font.hpp help.cpp show_...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/05/17 22:19:40

Modified files:
        src            : dialogs.cpp font.hpp help.cpp show_dialog.cpp 

Log message:
        use a slightly larger font in tiny-gui mode; changed the way we adjust 
some widget sizes in tiny-gui mode to make them fit with the new font-size

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.hpp.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.129&tr2=1.130&r1=text&r2=text

Patches:
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.103 wesnoth/src/dialogs.cpp:1.104
--- wesnoth/src/dialogs.cpp:1.103       Mon May 16 23:03:04 2005
+++ wesnoth/src/dialogs.cpp     Tue May 17 22:19:40 2005
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.103 2005/05/16 23:03:04 ydirson Exp $ */
+/* $Id: dialogs.cpp,v 1.104 2005/05/17 22:19:40 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -804,7 +804,11 @@
 
 campaign_preview_pane::campaign_preview_pane(CVideo 
&video,std::vector<std::pair<std::string,std::string> >* desc) : 
gui::preview_pane(video),descriptions_(desc),index_(0)
 {
-       set_measurements(font::relative_size(350), font::relative_size(400));
+#ifdef USE_TINY_GUI
+       set_measurements(160, 200);
+#else
+       set_measurements(350, 400);
+#endif
 }
 
 bool campaign_preview_pane::show_above() const { return false; }
Index: wesnoth/src/font.hpp
diff -u wesnoth/src/font.hpp:1.56 wesnoth/src/font.hpp:1.57
--- wesnoth/src/font.hpp:1.56   Sat May 14 19:18:31 2005
+++ wesnoth/src/font.hpp        Tue May 17 22:19:40 2005
@@ -1,4 +1,4 @@
-/* $Id: font.hpp,v 1.56 2005/05/14 19:18:31 Sirp Exp $ */
+/* $Id: font.hpp,v 1.57 2005/05/17 22:19:40 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -54,7 +54,7 @@
 // font sizes, to be made theme parameters
 #ifdef USE_TINY_GUI
 // this is not meant for normal play, just for checking other dimensions get 
adapted accordingly
-const int SIZE_NORMAL = 8;
+const int SIZE_NORMAL = 10;
 #else
 const int SIZE_NORMAL = 14;
 #endif
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.99 wesnoth/src/help.cpp:1.100
--- wesnoth/src/help.cpp:1.99   Mon May 16 22:44:19 2005
+++ wesnoth/src/help.cpp        Tue May 17 22:19:40 2005
@@ -2164,7 +2164,11 @@
   const int menu_buttons_padding = font::relative_size(10);
        const int menu_y = location().y;
        const int menu_x = location().x;
-       const int menu_w = font::relative_size(250);
+#ifdef USE_TINY_GUI
+       const int menu_w = 120;
+#else
+       const int menu_w = 250;
+#endif
        const int menu_h = height() - back_button_.height() - 
menu_buttons_padding;
        
        const int menu_text_area_padding = font::relative_size(10);
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.129 wesnoth/src/show_dialog.cpp:1.130
--- wesnoth/src/show_dialog.cpp:1.129   Mon May 16 22:44:20 2005
+++ wesnoth/src/show_dialog.cpp Tue May 17 22:19:40 2005
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.129 2005/05/16 22:44:20 ydirson Exp $ */
+/* $Id: show_dialog.cpp,v 1.130 2005/05/17 22:19:40 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -373,7 +373,12 @@
                text_widget_height = text_widget.location().h + 
message_font_size;
        }
 
-       menu menu_(screen,menu_items,type == MESSAGE,-1,-1,sorter);
+#ifdef USE_TINY_GUI
+       const int max_menu_width = 150;
+#else
+       const int max_menu_width = -1;
+#endif
+       menu menu_(screen,menu_items,type == MESSAGE,-1,max_menu_width,sorter);
 
        menu_.set_numeric_keypress_selection(use_textbox == false);