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

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Origin commit data
------------------
Commit: 23990764bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-13 (Thu, 13 Oct 2016)
This commit is contained in:
vanhofen
2016-10-13 21:15:41 +02:00
parent d9dc418580 62c1270e0c
commit 4b7fb1d2ed
12 changed files with 201 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/components/cc_frm_scrollbar.cpp
View File

@@ -111,6 +111,7 @@ void CComponentsScrollBar::initTopNaviIcon()
//initialize icon object
if (sb_up_obj == NULL){
sb_up_obj = new CComponentsPicture(CC_CENTERED, fr_thickness, sb_up_icon, this);
sb_up_obj->SetTransparent(CFrameBuffer::TM_BLACK);
sb_up_obj->doPaintBg(false);
}
sb_up_obj->setWidth(width-2*fr_thickness);
@@ -121,6 +122,7 @@ void CComponentsScrollBar::initBottomNaviIcon()
//initialize icon object
if (sb_down_obj == NULL){
sb_down_obj = new CComponentsPicture(CC_CENTERED, CC_APPEND, sb_down_icon, this);
sb_down_obj->SetTransparent(CFrameBuffer::TM_BLACK);
sb_down_obj->doPaintBg(false);
}
sb_down_obj->setWidth(width-2*fr_thickness);
@@ -165,13 +167,17 @@ void CComponentsScrollBar::initSegments()
//set color for marked id
if (sb_mark_id == id){
item->setColorBody(COL_MENUCONTENTSELECTED_PLUS_0);
item->setColorBody(COL_SCROLLBAR_ACTIVE);
#if 0
item->enableColBodyGradient(CC_COLGRAD_COL_A_2_COL_B);
item->setColBodyGradient(CColorGradient::gradientDark2Light2Dark, CFrameBuffer::gradientHorizontal);
#endif
}
else{
item->setColorBody(COL_SCROLLBAR_PASSIVE_PLUS_0);
item->setColorBody(COL_SCROLLBAR_PASSIVE);
#if 0
item->disableColBodyGradient();
#endif
}
}

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

@@ -70,7 +70,7 @@ CComponentsInfoBox::CComponentsInfoBox( const int& x_pos,
pic = NULL;
cctext = NULL;
pic_name = "";
x_offset = 10;
x_offset = OFFSET_INNER_MID;
initParent(parent);
}
@@ -155,7 +155,7 @@ void CComponentsInfoBox::paint(bool do_save_bg)
//calculate vars for x-position and dimensions
int tx = x_offset + x_text + pic_w;
int tw = width - x_offset - pic_w - 2*fr_thickness;
int tw = width - 2*x_offset - pic_w - 2*fr_thickness;
int th = height-2*fr_thickness;
cctext->setDimensionsAll(tx, y_text, tw, th);

3
src/gui/components/cc_item_text.h
View File

@@ -173,6 +173,9 @@ class CComponentsText : public CCTextScreen, public CComponentsItem, public CBox
///returns current text content of text/label object as std::string
virtual std::string getText(){return ct_text;};
///return current font
Font* getFont(){return ct_font;}
///set screen x-position, parameter as int
virtual void setXPos(const int& xpos);
///set screen y-position, parameter as int