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

CComponents::paintFbItems: Fix paint frame

Browse Source 
- Remove function CComponents::allowPaint()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 612ef514a3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)

Origin message was:
------------------
* CComponents::paintFbItems: Fix paint frame

- Remove function CComponents::allowPaint()


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2013-05-09 21:54:25 +02:00
parent 0a2403d344
commit cc3927aa46
2 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,8 +36,6 @@
class CComponents class CComponents
{ {
private:
bool allowPaint(const int& i);
protected: protected:
int x, y, height, width, corner_type, shadow_w; int x, y, height, width, corner_type, shadow_w;
int corner_rad, fr_thickness, fr_thickness_sel; int corner_rad, fr_thickness, fr_thickness_sel;

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

@@ -80,24 +80,6 @@ void CComponents::initVarBasic()
saved_screen.pixbuf = NULL; saved_screen.pixbuf = NULL;
} }
bool CComponents::allowPaint(const int& i)
{
if(v_fbdata[i].fbdata_type == CC_FBDATA_TYPE_BOX)
return true;
if (v_fbdata[CC_FBDATA_TYPE_BOX].x != v_fbdata[i].x)
return true;
else if (v_fbdata[CC_FBDATA_TYPE_BOX].y != v_fbdata[i].y)
return true;
else if (v_fbdata[CC_FBDATA_TYPE_BOX].dx != v_fbdata[i].dx)
return true;
else if (v_fbdata[CC_FBDATA_TYPE_BOX].dy != v_fbdata[i].dy)
return true;
return false;
}
//paint framebuffer stuff and fill buffer //paint framebuffer stuff and fill buffer
void CComponents::paintFbItems(bool do_save_bg) void CComponents::paintFbItems(bool do_save_bg)
{ {
@@ -140,11 +122,13 @@ void CComponents::paintFbItems(bool do_save_bg)
firstPaint = false; firstPaint = false;
} }
if (fbtype != CC_FBDATA_TYPE_BGSCREEN){ if (fbtype != CC_FBDATA_TYPE_BGSCREEN){
if (fbtype == CC_FBDATA_TYPE_FRAME && v_fbdata[i].frame_thickness > 0) if (fbtype == CC_FBDATA_TYPE_FRAME) {
frameBuffer->paintBoxFrame(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, v_fbdata[i].frame_thickness, v_fbdata[i].color, v_fbdata[i].r); if (v_fbdata[i].frame_thickness > 0)
frameBuffer->paintBoxFrame(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, v_fbdata[i].frame_thickness, v_fbdata[i].color, v_fbdata[i].r);
}
else if (fbtype == CC_FBDATA_TYPE_BACKGROUND) else if (fbtype == CC_FBDATA_TYPE_BACKGROUND)
frameBuffer->paintBackgroundBoxRel(x, y, v_fbdata[i].dx, v_fbdata[i].dy); frameBuffer->paintBackgroundBoxRel(x, y, v_fbdata[i].dx, v_fbdata[i].dy);
else if( allowPaint(i) || fbtype == CC_FBDATA_TYPE_LINE) else
frameBuffer->paintBoxRel(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, v_fbdata[i].color, v_fbdata[i].r, corner_type); frameBuffer->paintBoxRel(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, v_fbdata[i].color, v_fbdata[i].r, corner_type);
} }
} }