mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponents: use paintBoxRel() only in kill()

Browse Source 
paintBackgroundBoxRel() ignores rounded corners. This avoids painting of
undesirable parts on corners.
This commit is contained in:
Thilo Graf
2014-05-18 21:49:07 +02:00
parent 336ddf75b6
commit dc007e810a
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/components/cc_base.cpp
View File

@@ -228,13 +228,20 @@ inline void CComponents::hide()
}
//erase or paint over rendered objects
void CComponents::kill(const fb_pixel_t& bg_color)
void CComponents::kill(const fb_pixel_t& bg_color, const int& corner_radius)
{
for(size_t i =0; i< v_fbdata.size() ;i++){
if (bg_color)
frameBuffer->paintBoxRel(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, bg_color, v_fbdata[i].r, corner_type);
#if 0
if (bg_color != COL_BACKGROUND)
#endif
int r = v_fbdata[i].r;
if (corner_radius > -1)
r = corner_radius;
frameBuffer->paintBoxRel(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, bg_color, r, corner_type);
#if 0
else
frameBuffer->paintBackgroundBoxRel(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy);
#endif
}
clearFbData();
firstPaint = true;

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

@@ -204,7 +204,7 @@ class CComponents
///erase or paint over rendered objects without restore of background, it's similar to paintBackgroundBoxRel() known
///from CFrameBuffer but with possiblity to define color, default color is COL_BACKGROUND (empty background)
virtual void kill(const fb_pixel_t& bg_color = COL_BACKGROUND);
virtual void kill(const fb_pixel_t& bg_color = COL_BACKGROUND, const int& corner_radius = -1);
///returns paint mode, true=item was painted
virtual bool isPainted(){return is_painted;}

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

@@ -138,12 +138,12 @@ void CComponentsItem::hide(bool no_restore)
void CComponentsItem::kill(const fb_pixel_t& bg_color, bool ignore_parent)
{
if(cc_parent == NULL){
CComponents::kill(bg_color);
CComponents::kill(bg_color, this->corner_rad);
}else{
if(ignore_parent)
CComponents::kill(bg_color);
CComponents::kill(bg_color, this->corner_rad);
else
CComponents::kill(cc_parent->getColorBody());
CComponents::kill(cc_parent->getColorBody(), cc_parent->getCornerRadius());
}
}