Mercurial > fife-parpg
comparison engine/core/gui/widgets/clicklabel.cpp @ 228:756b895e1dab
Merged unicode-support back into trunk.
Now all GUI/visible strings should be unicode.
Internal strings unchanged.
Remember to use a font that actually has the desired codepoints.
Current default unicode policiy is 'ignore'.
author | phoku@33b003aa-7bff-0310-803a-e67f0ece8222 |
---|---|
date | Sat, 21 Mar 2009 10:38:11 +0000 |
parents | bb9902910067 |
children | 51cc05d862f2 |
comparison
equal
deleted
inserted
replaced
227:d642169490f7 | 228:756b895e1dab |
---|---|
113 if (mGuiFont) { | 113 if (mGuiFont) { |
114 FIFE::Image* image; | 114 FIFE::Image* image; |
115 if( isTextWrapping() ) { | 115 if( isTextWrapping() ) { |
116 image = mGuiFont->getAsImageMultiline(mWrappedText); | 116 image = mGuiFont->getAsImageMultiline(mWrappedText); |
117 } else { | 117 } else { |
118 image = mGuiFont->getAsImage(mCaption); | 118 image = mGuiFont->getAsImageMultiline(mCaption); |
119 } | 119 } |
120 setWidth( image->getWidth() ); | 120 setWidth( image->getWidth() ); |
121 setHeight( image->getHeight() ); | 121 setHeight( image->getHeight() ); |
122 } | 122 } |
123 } | 123 } |