mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsText: add switch for utf8 disable/enable

Browse Source
This commit is contained in:
Thilo Graf
2015-07-12 18:38:32 +02:00
committed by Jacek Jendrzej
parent 37c863d141
commit ccdaacb0a0
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_item_text.cpp
View File

@@ -104,6 +104,7 @@ void CComponentsText::initVarText( const int x_pos, const int y_pos, const int w
ct_text_sent = false; ct_text_sent = false;
ct_paint_textbg = false; ct_paint_textbg = false;
ct_force_text_paint = false; ct_force_text_paint = false;
ct_utf8_encoded = true;
initCCText(); initCCText();
initParent(parent); initParent(parent);
@@ -148,6 +149,7 @@ void CComponentsText::initCCText()
ct_textbox->setWindowMaxDimensions(iWidth, iHeight); ct_textbox->setWindowMaxDimensions(iWidth, iHeight);
ct_textbox->setWindowMinDimensions(iWidth, iHeight); ct_textbox->setWindowMinDimensions(iWidth, iHeight);
ct_textbox->enableSaveScreen(save_tbox_screen); ct_textbox->enableSaveScreen(save_tbox_screen);
ct_textbox->enableUTF8(ct_utf8_encoded);
//observe behavior of parent form if available //observe behavior of parent form if available
bool force_text_paint = ct_force_text_paint; bool force_text_paint = ct_force_text_paint;

5
src/gui/components/cc_item_text.h
View File

@@ -63,6 +63,8 @@ class CComponentsText : public CComponentsItem, public CBox
///status: cached text string, mainly required to compare with current text ///status: cached text string, mainly required to compare with current text
std::string ct_old_text; std::string ct_old_text;
bool ct_utf8_encoded;
///status: current text string is sent to CTextBox object ///status: current text string is sent to CTextBox object
bool ct_text_sent; bool ct_text_sent;
///property: send to CTextBox object enableBackgroundPaint(true) ///property: send to CTextBox object enableBackgroundPaint(true)
@@ -170,6 +172,9 @@ class CComponentsText : public CComponentsItem, public CBox
if (ct_textbox) if (ct_textbox)
ct_textbox->enableSaveScreen(mode); ct_textbox->enableSaveScreen(mode);
} }
///enable/disable utf8 encoding
void enableUTF8(bool enable = true){ct_utf8_encoded = enable;}
void disableUTF8(bool enable = false){enableUTF8(enable);}
}; };

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

@@ -194,7 +194,7 @@ class CTextBox
void setWindowMinDimensions(const int width, const int height); void setWindowMinDimensions(const int width, const int height);
void setFontUseDigitHeight(bool set=true); void setFontUseDigitHeight(bool set=true);
void enableUTF8(bool enable = true){m_utf8_encoded = enable;} void enableUTF8(bool enable = true){m_utf8_encoded = enable;}
void disableUTF8(bool enable = false){enableUTF8(false);} void disableUTF8(bool enable = false){enableUTF8(enable);}
inline bool isPainted(void) {if( frameBuffer == NULL) return (false); else return (true);}; inline bool isPainted(void) {if( frameBuffer == NULL) return (false); else return (true);};
inline CBox getWindowsPos(void) {return(m_cFrame);}; inline CBox getWindowsPos(void) {return(m_cFrame);};