mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/volumebar.cpp


Origin commit data
------------------
Commit: cd8b9f9b04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
This commit is contained in:
vanhofen
2017-01-29 22:37:31 +01:00
parent 5f7c69b604 07e46bcfa7
commit 1d873df948
6 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,6 +285,7 @@ void CComponentsText::paintText(bool do_save_bg)
void CComponentsText::paint(bool do_save_bg)
{
OnBeforePaint();
paintText(do_save_bg);
}
@@ -298,13 +299,14 @@ void CComponentsText::hide()
ct_force_text_paint = true;
}
void CComponentsText::kill()
void CComponentsText::kill(const fb_pixel_t& bg_color, const int& corner_radius, const int& fblayer_type)
{
if (ct_textbox)
ct_textbox->hide();
ct_old_text.clear();
CCDraw::kill();
force_paint_bg = true;
CCDraw::kill(bg_color, corner_radius, fblayer_type);
ct_force_text_paint = true;
}

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

@@ -139,7 +139,7 @@ class CComponentsText : public CCTextScreen, public CComponentsItem
///hide textbox
void hide();
///remove textbox from screen
void kill();
void kill(const fb_pixel_t& bg_color = COL_BACKGROUND_PLUS_0, const int& corner_radius = -1, const int& fblayer_type = CC_FBDATA_TYPES);
///paint text box, parameter do_save_bg: default = true, causes fill of backckrond pixel buffer
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);