[Wesnoth-cvs-commits] wesnoth/src font.hpp

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/10/04 23:34:51

Modified files:
        src            : font.hpp 

Log message:
        automatic computation of font sizes relatively to SIZE_NORMAL; make 
TINY mode really tiny to better help with UI downsizing work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.hpp.diff?tr1=1.43&tr2=1.44&r1=text&r2=text

Patches:
Index: wesnoth/src/font.hpp
diff -u wesnoth/src/font.hpp:1.43 wesnoth/src/font.hpp:1.44
--- wesnoth/src/font.hpp:1.43   Mon Sep 27 00:24:41 2004
+++ wesnoth/src/font.hpp        Mon Oct  4 23:34:51 2004
@@ -1,4 +1,4 @@
-/* $Id: font.hpp,v 1.43 2004/09/27 00:24:41 ydirson Exp $ */
+/* $Id: font.hpp,v 1.44 2004/10/04 23:34:51 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -42,28 +42,23 @@
 //standard markups
 extern const char LARGE_TEXT, SMALL_TEXT, GOOD_TEXT, BAD_TEXT, NORMAL_TEXT, 
BLACK_TEXT, BOLD_TEXT, IMAGE, NULL_MARKUP;
 
-// font sizes, probably to make theme parameters
-#ifndef USE_TINY_GUI
-const int SIZE_NORMAL = 14,
-  SIZE_TINY = 10,
-  SIZE_SMALL = 12,
-
-  SIZE_15 = 15,
-  SIZE_PLUS = 16,
-  SIZE_LARGE = 18,
-  SIZE_XLARGE = 24
-  ;  
+// 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;
 #else
-const int SIZE_NORMAL = 10,
-  SIZE_TINY = 6,
-  SIZE_SMALL = 8,
-
-  SIZE_15 = 11,
-  SIZE_PLUS = 12,
-  SIZE_LARGE = 14,
-  SIZE_XLARGE = 20
-  ;  
+const int SIZE_NORMAL = 14;
 #endif
+// automatic computation of other font sizes, to be made a default for 
theme-provided values
+const int
+  SIZE_TINY    = SIZE_NORMAL * 10 / 14,
+  SIZE_SMALL   = SIZE_NORMAL * 12 / 14,
+
+  SIZE_15      = SIZE_NORMAL * 15 / 14,
+  SIZE_PLUS    = SIZE_NORMAL * 16 / 14,
+  SIZE_LARGE   = SIZE_NORMAL * 18 / 14,
+  SIZE_XLARGE  = SIZE_NORMAL * 24 / 14
+  ;  
 //function to draw text on the screen. The text will be clipped to area.
 //If the text runs outside of area horizontally, an ellipsis will be displayed
 //at the end of it. If use_tooltips is true, then text with an ellipsis will