From 4e002bdf66e51ecaa9d4147a38b98f4d5eb43e69 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 13 Jul 2015 18:02:23 +0200 Subject: [PATCH] CTextBox: consider utf8 mode parameter for correct render width, if required --- src/gui/widget/textbox.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp index 90686016f..a507ef8df 100644 --- a/src/gui/widget/textbox.cpp +++ b/src/gui/widget/textbox.cpp @@ -397,7 +397,7 @@ void CTextBox::refreshTextLineArray(void) aktWord = m_cText.substr(pos_prev, pos - pos_prev + 1); //calculate length of current found word - aktWordWidth = m_pcFontText->getRenderWidth(aktWord); + aktWordWidth = m_pcFontText->getRenderWidth(aktWord, m_utf8_encoded); //set next start pos pos_prev = pos + 1; @@ -640,10 +640,10 @@ void CTextBox::refreshText(void) { //calculate centered xpos if( m_nMode & CENTER ){ - x_center = ((m_cFrameTextRel.iWidth - m_pcFontText->getRenderWidth(m_cLineArray[i]))>>1) - text_Hborder_width; + x_center = ((m_cFrameTextRel.iWidth - m_pcFontText->getRenderWidth(m_cLineArray[i]))>>1, m_utf8_encoded) - text_Hborder_width; } else if ( m_nMode & RIGHT ){ - x_center = ((m_cFrameTextRel.iWidth - m_pcFontText->getRenderWidth(m_cLineArray[i])) - text_Hborder_width*2); + x_center = ((m_cFrameTextRel.iWidth - m_pcFontText->getRenderWidth(m_cLineArray[i]), m_utf8_encoded) - text_Hborder_width*2); if ( m_nMode & SCROLL ) x_center -= SCROLL_FRAME_WIDTH; }