aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Font.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-08-28 18:10:19 (GMT)
committerrathnor <rathnor>2004-08-28 18:10:19 (GMT)
commitc4c67dafeb9165f394c1bae25604f97921a8ae7a (patch)
treef4489d70010c6de1cc141ea52bd7c9ccf603fb0a /src/FbTk/Font.cc
parent11f8d9c21f6da5abf01d942589914b26e04c20d9 (diff)
downloadfluxbox-c4c67dafeb9165f394c1bae25604f97921a8ae7a.zip
fluxbox-c4c67dafeb9165f394c1bae25604f97921a8ae7a.tar.bz2
fix a issue with fonts coming up blank
Diffstat (limited to 'src/FbTk/Font.cc')
-rw-r--r--src/FbTk/Font.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index 7cacbd5..40da222 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22//$Id: Font.cc,v 1.12 2004/08/25 10:03:09 akir Exp $ 22//$Id: Font.cc,v 1.13 2004/08/28 18:10:19 rathnor Exp $
23 23
24 24
25#include "StringUtil.hh" 25#include "StringUtil.hh"
@@ -356,7 +356,7 @@ bool Font::load(const std::string &name) {
356} 356}
357 357
358unsigned int Font::textWidth(const char * const text, unsigned int size) const { 358unsigned int Font::textWidth(const char * const text, unsigned int size) const {
359 if (isAntialias() && m_iconv != (iconv_t)(-1)) { 359 if (m_iconv != (iconv_t)(-1)) {
360 char* rtext = recode(m_iconv, text, size); 360 char* rtext = recode(m_iconv, text, size);
361 if (rtext != 0) 361 if (rtext != 0)
362 size = strlen(rtext); 362 size = strlen(rtext);
@@ -392,7 +392,7 @@ void Font::drawText(Drawable w, int screen, GC gc,
392 // so we don't end up in a loop with m_shadow 392 // so we don't end up in a loop with m_shadow
393 static bool first_run = true; 393 static bool first_run = true;
394 394
395 if (isAntialias() && m_iconv != (iconv_t)(-1) && first_run) { 395 if (m_iconv != (iconv_t)(-1) && first_run) {
396 rtext = recode(m_iconv, text, len); 396 rtext = recode(m_iconv, text, len);
397 if (rtext != 0) { 397 if (rtext != 0) {
398 len = strlen(rtext); 398 len = strlen(rtext);