mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- textbox: fix text position in mode CENTER and mode RIGHT; ...

Browse Source 
and add VISUAL_DEBUG define. That paints beautiful colored boxes
to see what's going on.
This commit is contained in:
svenhoefer
2016-10-13 19:07:22 +02:00
parent e8e237df40
commit c074f1365f
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/widget/textbox.cpp
View File

@@ -51,6 +51,8 @@
****************************************************************************/ ****************************************************************************/
//#define VISUAL_DEBUG
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
@@ -59,6 +61,9 @@
#include <system/debug.h> #include <system/debug.h>
#include "textbox.h" #include "textbox.h"
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
#ifdef VISUAL_DEBUG
#include <gui/color_custom.h>
#endif
#define SCROLL_FRAME_WIDTH 10 #define SCROLL_FRAME_WIDTH 10
#define SCROLL_MARKER_BORDER 2 #define SCROLL_MARKER_BORDER 2
@@ -69,7 +74,6 @@
#define MIN_WINDOW_WIDTH ((g_settings.screen_EndX - g_settings.screen_StartX)>>1) #define MIN_WINDOW_WIDTH ((g_settings.screen_EndX - g_settings.screen_StartX)>>1)
#define MIN_WINDOW_HEIGHT 40 #define MIN_WINDOW_HEIGHT 40
CTextBox::CTextBox(const char * text, Font* font_text, const int pmode, CTextBox::CTextBox(const char * text, Font* font_text, const int pmode,
const CBox* position, CFBWindow::color_t textBackgroundColor) const CBox* position, CFBWindow::color_t textBackgroundColor)
{ {
@@ -643,23 +647,33 @@ void CTextBox::refreshText(void)
// fit into mid of frame space // fit into mid of frame space
y += m_nFontTextHeight + ((m_cFrameTextRel.iHeight - m_nFontTextHeight * lines) >> 1); y += m_nFontTextHeight + ((m_cFrameTextRel.iHeight - m_nFontTextHeight * lines) >> 1);
#ifdef VISUAL_DEBUG
frameBuffer->paintBoxRel(m_cFrame.iX, m_cFrame.iY, m_cFrame.iWidth, m_cFrame.iHeight, COL_GREEN);
#endif
for(i = m_nCurrentLine; i < m_nNrOfLines && i < m_nCurrentLine + m_nLinesPerPage; i++) for(i = m_nCurrentLine; i < m_nNrOfLines && i < m_nCurrentLine + m_nLinesPerPage; i++)
{ {
//calculate centered xpos //calculate xpos
if( m_nMode & CENTER ){ if ((m_nMode & CENTER) || (m_nMode & RIGHT))
x_center = ((m_cFrameTextRel.iWidth - m_pcFontText->getRenderWidth(m_cLineArray[i], m_utf8_encoded))>>1) - text_Hborder_width; {
} x_center = m_cFrameTextRel.iWidth - m_cFrameTextRel.iX - 2*text_Hborder_width - m_pcFontText->getRenderWidth(m_cLineArray[i], m_utf8_encoded);
else if ( m_nMode & RIGHT ){ if (m_nMode & CENTER)
x_center = ((m_cFrameTextRel.iWidth - m_pcFontText->getRenderWidth(m_cLineArray[i], m_utf8_encoded)) - text_Hborder_width*2); x_center /= 2;
if (m_nMode & SCROLL) if (m_nMode & SCROLL)
x_center -= SCROLL_FRAME_WIDTH; x_center -= SCROLL_FRAME_WIDTH;
} }
x_center = std::max(x_center, 0); x_center = std::max(x_center, 0);
int tx = m_cFrame.iX + m_cFrameTextRel.iX + text_Hborder_width + x_center;
int ty = m_cFrame.iY + y;
int tw = m_cFrameTextRel.iWidth - m_cFrameTextRel.iX - 2*text_Hborder_width - x_center;
#ifdef VISUAL_DEBUG
int th = m_nFontTextHeight;
frameBuffer->paintBoxRel(tx, ty-th, tw, th, COL_RED);
#endif
//TRACE("[CTextBox] %s Line %d m_cFrame.iX %d m_cFrameTextRel.iX %d\r\n", __FUNCTION__, __LINE__, m_cFrame.iX, m_cFrameTextRel.iX); //TRACE("[CTextBox] %s Line %d m_cFrame.iX %d m_cFrameTextRel.iX %d\r\n", __FUNCTION__, __LINE__, m_cFrame.iX, m_cFrameTextRel.iX);
m_pcFontText->RenderString(m_cFrame.iX + m_cFrameTextRel.iX + text_Hborder_width + x_center, m_pcFontText->RenderString(tx, ty, tw, m_cLineArray[i].c_str(), m_textColor, 0, m_renderMode | (m_utf8_encoded) ? Font::IS_UTF8 : 0);
y+m_cFrame.iY, m_cFrameTextRel.iWidth, m_cLineArray[i].c_str(),
m_textColor, 0, m_renderMode | (m_utf8_encoded) ? Font::IS_UTF8 : 0);
m_old_cText = m_cText; m_old_cText = m_cText;
y += m_nFontTextHeight; y += m_nFontTextHeight;
} }