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/CMsgBox: reduce data type conflicts

Browse Source
This commit is contained in:
Thilo Graf
2012-09-14 20:44:56 +02:00
parent d2b9429669
commit 342fa5f88a
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/widget/msgbox.h
View File

@@ -75,7 +75,7 @@ class CMsgBox
mbAll = 0x07, mbAll = 0x07,
mbBack = 0x08 mbBack = 0x08
}; };
enum mode_ enum modes
{ {
AUTO_WIDTH = 0x01, AUTO_WIDTH = 0x01,
AUTO_HIGH = 0x02, AUTO_HIGH = 0x02,
@@ -85,7 +85,7 @@ class CMsgBox
BORDER = 0x20, BORDER = 0x20,
CENTER = 0x40, CENTER = 0x40,
NO_AUTO_LINEBREAK= 0x80 NO_AUTO_LINEBREAK= 0x80
}mode; };
private: private:
/* Functions */ /* Functions */

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

@@ -83,8 +83,19 @@ class CBox
int iHeight; int iHeight;
}; };
class CTextBox class CTextBox
{ {
public:
/* Variables */
enum textbox_modes
{
AUTO_WIDTH = 0x01,
AUTO_HIGH = 0x02,
SCROLL = 0x04,
CENTER = 0x40,
NO_AUTO_LINEBREAK = 0x80
};
private: private:
/* Functions */ /* Functions */
void refreshTextLineArray(void); void refreshTextLineArray(void);
@@ -132,22 +143,12 @@ class CTextBox
int text_border_width; int text_border_width;
public: public:
/* Variables */
typedef enum mode_
{
AUTO_WIDTH = 0x01,
AUTO_HIGH = 0x02,
SCROLL = 0x04,
CENTER = 0x40,
NO_AUTO_LINEBREAK = 0x80
} mode;
/* Constructor */ /* Constructor */
CTextBox(); CTextBox();
CTextBox( const char * text); CTextBox( const char * text);
CTextBox( const char * text, CTextBox( const char * text,
Font* font_text, Font* font_text,
const int mode, const int pmode,
const CBox* position, const CBox* position,
CFBWindow::color_t textBackgroundColor = COL_MENUCONTENT_PLUS_0); CFBWindow::color_t textBackgroundColor = COL_MENUCONTENT_PLUS_0);
@@ -163,7 +164,7 @@ class CTextBox
void setBackGroundRadius(const int radius, const int type){m_nBgRadius = radius; m_nBgRadiusType = type;}; void setBackGroundRadius(const int radius, const int type){m_nBgRadius = radius; m_nBgRadiusType = type;};
void setTextBorderWidth(int border); void setTextBorderWidth(int border);
void setTextFont(Font* font_text); void setTextFont(Font* font_text);
void setTextMode(const mode text_mode){m_nMode = text_mode;}; void setTextMode(const int text_mode){m_nMode = text_mode;};
void setBackGroundColor(CFBWindow::color_t textBackgroundColor){m_textBackgroundColor = textBackgroundColor;}; void setBackGroundColor(CFBWindow::color_t textBackgroundColor){m_textBackgroundColor = textBackgroundColor;};
inline bool isPainted(void) {if( frameBuffer == NULL) return (false); else return (true);}; inline bool isPainted(void) {if( frameBuffer == NULL) return (false); else return (true);};