mail[Wesnoth-commits] r28872 - in /trunk/src/gui/widgets: canvas.cpp control.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on August 23, 2008 - 13:34:
Author: mordante
Date: Sat Aug 23 13:34:31 2008
New Revision: 28872

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28872&view=rev
Log:
Not use the text style for rendering and size determination.

Modified:
    trunk/src/gui/widgets/canvas.cpp
    trunk/src/gui/widgets/control.cpp

Modified: trunk/src/gui/widgets/canvas.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/canvas.cpp?rev=28872&r1=28871&r2=28872&view=diff
==============================================================================
--- trunk/src/gui/widgets/canvas.cpp (original)
+++ trunk/src/gui/widgets/canvas.cpp Sat Aug 23 13:34:31 2008
@@ -805,6 +805,7 @@
 
        text_renderer.set_text(text, false).
                set_font_size(font_size_).
+               set_font_style(font_style_).
                set_foreground_colour(colour_).
                set_maximum_width(maximum_width_(variables)).
                set_maximum_height(maximum_height_(variables));

Modified: trunk/src/gui/widgets/control.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/control.cpp?rev=28872&r1=28871&r2=28872&view=diff
==============================================================================
--- trunk/src/gui/widgets/control.cpp (original)
+++ trunk/src/gui/widgets/control.cpp Sat Aug 23 13:34:31 2008
@@ -242,6 +242,7 @@
 
        renderer_.set_text(label_, false);
        renderer_.set_font_size(config_->text_font_size);
+       renderer_.set_font_style(config_->text_font_style);
 
        // Try with the minimum wanted size.
        renderer_.set_maximum_width(size.x);




Related Messages


Powered by MHonArc, Updated Sat Aug 23 16:02:01 2008