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

CTextbox: add members setWindowMaxDimensions, setWindowMinDimensions

Browse Source 
so we can control max an mnin width and height
This commit is contained in:
Thilo Graf
2012-09-22 13:34:33 +02:00
parent 1244af4666
commit 130d7bf6c2
2 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,8 +60,8 @@
#include "textbox.h"
#include <gui/widget/icons.h>
#define SCROLL_FRAME_WIDTH 10
#define SCROLL_MARKER_BORDER 2
#define SCROLL_FRAME_WIDTH 10
#define SCROLL_MARKER_BORDER 2
#define MAX_WINDOW_WIDTH (g_settings.screen_EndX - g_settings.screen_StartX - 40)
#define MAX_WINDOW_HEIGHT (g_settings.screen_EndY - g_settings.screen_StartY - 40)
@@ -69,6 +69,7 @@
#define MIN_WINDOW_WIDTH ((g_settings.screen_EndX - g_settings.screen_StartX)>>1)
#define MIN_WINDOW_HEIGHT 40
CTextBox::CTextBox(const char * text, Font* font_text, const int pmode,
const CBox* position, CFBWindow::color_t textBackgroundColor)
{
@@ -161,6 +162,7 @@ void CTextBox::initVar(void)
m_pcFontText = NULL;
m_pcFontText = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1];
m_nFontTextHeight = m_pcFontText->getHeight();
m_nMaxTextWidth = 0;
m_nNrOfPages = 1;
m_nNrOfLines = 0;
@@ -176,6 +178,8 @@ void CTextBox::initVar(void)
m_nMaxHeight = MAX_WINDOW_HEIGHT;
m_nMaxWidth = MAX_WINDOW_WIDTH;
m_nMinHeight = MIN_WINDOW_HEIGHT;
m_nMinWidth = MIN_WINDOW_WIDTH;
m_textBackgroundColor = COL_MENUCONTENT_PLUS_0;
m_textColor = COL_MENUCONTENT;
@@ -185,7 +189,7 @@ void CTextBox::initVar(void)
m_cLineArray.clear();
max_width = 0;
// max_width = 0;
}
void CTextBox::initFramesAndTextArray()
@@ -213,20 +217,35 @@ void CTextBox::setTextBorderWidth(int border)
initFramesAndTextArray();
}
void CTextBox::setWindowMaxDimensions(const int width, const int height)
{
m_nMaxHeight = height;
m_nMaxWidth = width;
}
void CTextBox::setWindowMinDimensions(const int width, const int height)
{
m_nMinHeight = height;
m_nMinWidth = width;
}
void CTextBox::reSizeMainFrameWidth(int textWidth)
{
//TRACE("[CTextBox]->ReSizeMainFrameWidth: %d, current: %d\r\n",textWidth,m_cFrameTextRel.iWidth);
TRACE("[CTextBox]->%s: \ntext width: %d\n m_cFrame.iWidth: %d\n m_cFrameTextRel.iWidth: %d\n max_width: %d\n m_nMinWidth: %d\n",__FUNCTION__, textWidth, m_cFrame.iWidth, m_cFrameTextRel.iWidth, m_nMaxWidth, m_nMinWidth);
int iNewWindowWidth = textWidth + m_cFrameScrollRel.iWidth + 2*text_border_width;
if( iNewWindowWidth > m_nMaxWidth)
iNewWindowWidth = m_nMaxWidth;
iNewWindowWidth = m_nMaxWidth;
if( iNewWindowWidth < m_nMinWidth)
iNewWindowWidth = m_nMinWidth;
if( iNewWindowWidth < MIN_WINDOW_WIDTH)
iNewWindowWidth = MIN_WINDOW_WIDTH;
m_cFrame.iWidth = iNewWindowWidth;
TRACE("[CTextBox]->%s: \ntext width: %d\n m_cFrame.iWidth: %d\n m_cFrameTextRel.iWidth: %d\n max_width: %d\n m_nMinWidth: %d\n",__FUNCTION__, textWidth, m_cFrame.iWidth, m_cFrameTextRel.iWidth, m_nMaxWidth, m_nMinWidth);
/* Re-Init the children frames due to new main window */
initFramesRel();
}
@@ -240,8 +259,8 @@ void CTextBox::reSizeMainFrameHeight(int textHeight)
if( iNewWindowHeight > m_nMaxHeight)
iNewWindowHeight = m_nMaxHeight;
if( iNewWindowHeight < MIN_WINDOW_HEIGHT)
iNewWindowHeight = MIN_WINDOW_HEIGHT;
if( iNewWindowHeight < m_nMinHeight)
iNewWindowHeight = m_nMinHeight;
m_cFrame.iHeight = iNewWindowHeight;
@@ -307,7 +326,6 @@ void CTextBox::refreshTextLineArray(void)
int aktWidth = 0;
int aktWordWidth = 0;
int lineBreakWidth = 0;
int maxTextWidth = 0;
m_nNrOfNewLine = 0;
@@ -320,14 +338,14 @@ void CTextBox::refreshTextLineArray(void)
if( m_nMode & AUTO_WIDTH){
/* In case of autowidth, we calculate the max allowed width of the textbox */
lineBreakWidth = MAX_WINDOW_WIDTH - m_cFrameScrollRel.iWidth - 2*text_border_width;
lineBreakWidth = m_nMaxWidth - m_cFrameScrollRel.iWidth - 2*text_border_width;
}else{
/* If not autowidth, we just take the actuall textframe width */
lineBreakWidth = m_cFrameTextRel.iWidth - 2*text_border_width;
}
if(max_width)
lineBreakWidth = max_width;
if(m_nMaxWidth)
lineBreakWidth = m_nMaxWidth;
//TRACE("[CTextBox] line %d: lineBreakWidth %d\n", __LINE__, lineBreakWidth);
@@ -376,8 +394,8 @@ void CTextBox::refreshTextLineArray(void)
aktLine += aktWord;
aktWidth += aktWordWidth;
if (aktWidth > maxTextWidth)
maxTextWidth = aktWidth;
if (aktWidth > m_nMaxTextWidth)
m_nMaxTextWidth = aktWidth;
//TRACE_1(" aktLine : %s\r\n",aktLine.c_str());
//TRACE_1(" aktWidth: %d aktWordWidth:%d\r\n",aktWidth,aktWordWidth);
@@ -403,7 +421,7 @@ void CTextBox::refreshTextLineArray(void)
/* check if we have to recalculate the window frame size, due to auto width and auto height */
if( m_nMode & AUTO_WIDTH)
{
reSizeMainFrameWidth(maxTextWidth);
reSizeMainFrameWidth(m_nMaxTextWidth);
}
if(m_nMode & AUTO_HIGH)
@@ -558,11 +576,13 @@ void CTextBox::refresh(void)
}
bool CTextBox::setText(const std::string* newText, int _max_width)
bool CTextBox::setText(const std::string* newText, int max_width)
{
//TRACE("[CTextBox]->SetText \r\n");
bool result = false;
max_width = _max_width;
if (max_width>0)
m_nMaxTextWidth = max_width;
//printf("setText: _max_width %d max_width %d\n", _max_width, max_width);
if (newText != NULL)
{

11
src/gui/widget/textbox.h
View File

@@ -119,6 +119,10 @@ class CTextBox
int m_nMaxHeight;
int m_nMaxWidth;
int m_nMinHeight;
int m_nMinWidth;
int m_nMaxTextWidth;
int m_nMode;
@@ -140,7 +144,8 @@ class CTextBox
fb_pixel_t m_textColor;
CFrameBuffer * frameBuffer;
int max_width;
/* int max_width;*/
int text_border_width;
public:
@@ -160,7 +165,7 @@ class CTextBox
void scrollPageDown(const int pages);
void scrollPageUp(const int pages);
void enableBackgroundPaint(bool mode = true){m_nPaintBackground = mode;};
bool setText(const std::string* newText, int _max_width = 0);
bool setText(const std::string* newText, int max_width = 0);
void setTextColor(fb_pixel_t color_text){ m_textColor = color_text;};
void setBackGroundRadius(const int radius, const int type){m_nBgRadius = radius; m_nBgRadiusType = type;};
void setTextBorderWidth(int border);
@@ -168,6 +173,8 @@ class CTextBox
void setTextMode(const int text_mode){m_nMode = text_mode;};
void setBackGroundColor(CFBWindow::color_t textBackgroundColor){m_textBackgroundColor = textBackgroundColor;};
void setWindowPos(const CBox* position){m_cFrame = *position;};
void setWindowMaxDimensions(const int width, const int height);
void setWindowMinDimensions(const int width, const int height);
inline bool isPainted(void) {if( frameBuffer == NULL) return (false); else return (true);};
inline CBox getWindowsPos(void) {return(m_cFrame);};