mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsPicture: add member function paintPicture()

Browse Source 
compact calling in paint()
This commit is contained in:
Thilo Graf
2013-06-15 21:47:39 +02:00
parent f968abe6c5
commit 4df8d1d088
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/components/cc_item_picture.cpp
View File

@@ -167,23 +167,29 @@ void CComponentsPicture::initVarPicture()
height = max(max(pic_height, pic_max_h), height) + sw ; height = max(max(pic_height, pic_max_h), height) + sw ;
} }
void CComponentsPicture::paint(bool do_save_bg) void CComponentsPicture::paintPicture()
{ {
initVarPicture();
paintInit(do_save_bg);
pic_painted = false; pic_painted = false;
if (do_paint){
#ifdef DEBUG_CC #ifdef DEBUG_CC
printf(" [CComponentsPicture] %s: paint image: %s (do_paint=%d)\n", __FUNCTION__, pic_name.c_str(), do_paint); printf(" [CComponentsPicture] %s: paint image: %s (do_paint=%d)\n", __FUNCTION__, pic_name.c_str(), do_paint);
#endif #endif
if (do_paint){
if (pic_paint_mode == CC_PIC_IMAGE_MODE_OFF) if (pic_paint_mode == CC_PIC_IMAGE_MODE_OFF)
pic_painted = frameBuffer->paintIcon(pic_name, pic_x, pic_y, 0 /*pic_max_h*/, pic_offset, pic_paint, pic_paintBg, col_body); pic_painted = frameBuffer->paintIcon(pic_name, pic_x, pic_y, 0 /*pic_max_h*/, pic_offset, pic_paint, pic_paintBg, col_body);
else if (pic_paint_mode == CC_PIC_IMAGE_MODE_ON) else if (pic_paint_mode == CC_PIC_IMAGE_MODE_ON)
pic_painted = g_PicViewer->DisplayImage(pic_name, pic_x, pic_y, pic_width, pic_height); pic_painted = g_PicViewer->DisplayImage(pic_name, pic_x, pic_y, pic_width, pic_height);
do_paint = false;
} }
if (pic_painted)
do_paint = false;
}
void CComponentsPicture::paint(bool do_save_bg)
{
initVarPicture();
paintInit(do_save_bg);
paintPicture();
} }
void CComponentsPicture::hide(bool no_restore) void CComponentsPicture::hide(bool no_restore)

1
src/gui/components/cc_item_picture.h
View File

@@ -65,6 +65,7 @@ class CComponentsPicture : public CComponentsItem
void init( const int x_pos, const int y_pos, const std::string& image_name, const int alignment, bool has_shadow, void init( const int x_pos, const int y_pos, const std::string& image_name, const int alignment, bool has_shadow,
fb_pixel_t color_frame, fb_pixel_t color_background, fb_pixel_t color_shadow); fb_pixel_t color_frame, fb_pixel_t color_background, fb_pixel_t color_shadow);
void paintPicture();
public: public:
CComponentsPicture( const int x_pos, const int y_pos, const int w, const int h, CComponentsPicture( const int x_pos, const int y_pos, const int w, const int h,