Author: silene
Date: Sun Apr 26 10:12:16 2009
New Revision: 35226
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35226&view=rev
Log:
Fixed improper families passed to Pango. (Bug #13399)
Modified:
trunk/data/core/fonts.cfg
trunk/src/font.cpp
trunk/src/font.hpp
trunk/src/text.cpp
Modified: trunk/data/core/fonts.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/fonts.cfg?rev=35226&r1=35225&r2=35226&view=diff
==============================================================================
--- trunk/data/core/fonts.cfg (original)
+++ trunk/data/core/fonts.cfg Sun Apr 26 10:12:16 2009
@@ -5,6 +5,7 @@
# provide different font orders: one just has to install the
# missing fonts without needing to change the gmo files
order=_ "DejaVuSans.ttf,wqy-zenhei.ttc"
+ family_order=_ "DejaVu Sans,WenQuanYi Zen Hei"
[font]
name="DejaVuSans.ttf"
Modified: trunk/src/font.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/font.cpp?rev=35226&r1=35225&r2=35226&view=diff
==============================================================================
--- trunk/src/font.cpp (original)
+++ trunk/src/font.cpp Sun Apr 26 10:12:16 2009
@@ -1254,7 +1254,7 @@
namespace font {
namespace {
- t_string font_order;
+ t_string family_order;
} // namespace
bool load_font_config()
@@ -1280,7 +1280,7 @@
known_fonts.insert(font["name"]);
}
- font_order = fonts_config["order"];
+ family_order = fonts_config["family_order"];
const std::vector<std::string> font_order =
utils::split(fonts_config["order"]);
std::vector<font::subset_descriptor> fontlist;
std::vector<std::string>::const_iterator font;
@@ -1300,9 +1300,9 @@
return true;
}
-const t_string& get_fonts()
-{
- return font_order;
+const t_string& get_font_families()
+{
+ return family_order;
}
void cache_mode(CACHE mode)
Modified: trunk/src/font.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/font.hpp?rev=35226&r1=35225&r2=35226&view=diff
==============================================================================
--- trunk/src/font.hpp (original)
+++ trunk/src/font.hpp Sun Apr 26 10:12:16 2009
@@ -167,7 +167,7 @@
bool load_font_config();
/** Returns the currently defined fonts. */
-const t_string& get_fonts();
+const t_string& get_font_families();
enum CACHE { CACHE_LOBBY, CACHE_GAME };
void cache_mode(CACHE mode);
Modified: trunk/src/text.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/text.cpp?rev=35226&r1=35225&r2=35226&view=diff
==============================================================================
--- trunk/src/text.cpp (original)
+++ trunk/src/text.cpp Sun Apr 26 10:12:16 2009
@@ -430,7 +430,7 @@
calculation_dirty_ = false;
surface_dirty_ = true;
- tfont font(get_fonts(), font_size_, font_style_);
+ tfont font(get_font_families(), font_size_, font_style_);
pango_layout_set_font_description(layout_, font.get());
pango_layout_get_pixel_extents(layout_, NULL, &rect_);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
