mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 02:41:12 +02:00
Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
src/driver/framebuffer.cpp
Origin commit data
------------------
Commit: c0e452856a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-13 (Thu, 13 Oct 2016)
This commit is contained in:
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user