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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: bf7b22020c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
This commit is contained in:
vanhofen
2016-11-07 12:57:58 +01:00
parent 8e6c72b559 114a75f363
commit 398a5d8a2b
8 changed files with 356 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,6 +83,11 @@ CComponentsInfoBox::~CComponentsInfoBox()
void CComponentsInfoBox::setPicture(const std::string& picture_name)
{
pic_name = picture_name;
if (!pic_name.empty()){
int w, h;
frameBuffer->getIconSize(pic_name.c_str(), &w, &h);
height = max(h, height);
}
}
void CComponentsInfoBox::setPicture(const char* picture_name)
@@ -105,8 +110,12 @@ void CComponentsInfoBox::paintPicture()
if (pic_name.empty())
return;
//NOTE: real values are reqiured, if we paint this item within a form as embedded cc-item
int x_pic = (cc_parent ? cc_xr : x) + fr_thickness;
int y_pic = (cc_parent ? cc_yr : y) + fr_thickness;
//init pic object and set icon paint position
pic = new CComponentsPicture(x+fr_thickness+x_offset, y+fr_thickness, 0, min(48, height-2*fr_thickness), pic_name); //NOTE: icons do not scale!
pic = new CComponentsPicture(x_pic+x_offset, y_pic, 0, min(48, height-2*fr_thickness), pic_name); //NOTE: icons do not scale!
pic->setColorBody(col_body);
@@ -115,7 +124,7 @@ void CComponentsInfoBox::paintPicture()
pic->doPaintBg(false);
//fit icon into frame
pic->setYPos(y+(height/2-pic->getHeight()/2));
pic->setYPos(y_pic+(height/2-pic->getHeight()/2));
//paint, but set visibility mode
pic->allowPaint(cc_allow_paint);