From cc3927aa46f29b1d5e5ae61a8da7a7bf575cf4d7 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Thu, 9 May 2013 21:54:25 +0200 Subject: [PATCH] CComponents::paintFbItems: Fix paint frame - Remove function CComponents::allowPaint() Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/612ef514a32ee78e9af8eb2589d18d1aac68d7db Author: Michael Liebmann 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 --- src/gui/components/cc.h | 2 -- src/gui/components/cc_base.cpp | 26 +++++--------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/src/gui/components/cc.h b/src/gui/components/cc.h index 8e68473d7..248bc2be0 100644 --- a/src/gui/components/cc.h +++ b/src/gui/components/cc.h @@ -36,8 +36,6 @@ class CComponents { - private: - bool allowPaint(const int& i); protected: int x, y, height, width, corner_type, shadow_w; int corner_rad, fr_thickness, fr_thickness_sel; diff --git a/src/gui/components/cc_base.cpp b/src/gui/components/cc_base.cpp index 5cb0a9f7f..30c84dea8 100644 --- a/src/gui/components/cc_base.cpp +++ b/src/gui/components/cc_base.cpp @@ -80,24 +80,6 @@ void CComponents::initVarBasic() 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 void CComponents::paintFbItems(bool do_save_bg) { @@ -140,11 +122,13 @@ void CComponents::paintFbItems(bool do_save_bg) firstPaint = false; } if (fbtype != CC_FBDATA_TYPE_BGSCREEN){ - if (fbtype == CC_FBDATA_TYPE_FRAME && 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); + if (fbtype == CC_FBDATA_TYPE_FRAME) { + 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) 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); } }