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

cc_frm_scrollbar: fix offsets; use OFFSET defines

Browse Source 
Origin commit data
------------------
Commit: 38c621ad5e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)

Origin message was:
------------------
- cc_frm_scrollbar: fix offsets; use OFFSET defines
This commit is contained in:
vanhofen
2016-12-16 09:03:07 +01:00
parent e5a5a8b41e
commit 77d89d2f0a
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,11 +76,13 @@ void CComponentsScrollBar::initVarSbForm(const int& count)
cc_item_type = CC_ITEMTYPE_FRM_SCROLLBAR; cc_item_type = CC_ITEMTYPE_FRM_SCROLLBAR;
fr_thickness = 0; fr_thickness = 0;
append_x_offset = 0; append_x_offset = OFFSET_INNER_MIN;
append_y_offset = 2; append_y_offset = OFFSET_INNER_MIN;
sb_up_obj = sb_down_obj = NULL; sb_up_obj = NULL;
sb_down_obj = NULL;
sb_segments_obj = NULL; sb_segments_obj = NULL;
setCorner(RADIUS_MIN, CORNER_ALL); setCorner(RADIUS_MIN, CORNER_ALL);
sb_up_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_UP) ; sb_up_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_UP) ;
@@ -130,19 +132,19 @@ void CComponentsScrollBar::initBottomNaviIcon()
void CComponentsScrollBar::initSegments() void CComponentsScrollBar::initSegments()
{ {
//init dimensions for segments //init dimensions for segments
int w_seg = width - 4*fr_thickness; int w_seg = width - 2*fr_thickness - 2*append_x_offset;
//never read int h_seg = height - (sb_segments_count-1)*append_y_offset; if (w_seg < 0)
w_seg = 0;
//calculate height of segment container //calculate height of segment container
int h_seg_obj = height - 2*sb_up_obj->getHeight() - 3*append_y_offset; int h_seg_obj = height - 2*fr_thickness - 2*sb_up_obj->getHeight() - 2*append_y_offset;
if(h_seg_obj < 0) if (h_seg_obj < 0)
h_seg_obj = 0; h_seg_obj = 0;
//init segment container //init segment container
if (sb_segments_obj == NULL){ if (sb_segments_obj == NULL){
sb_segments_obj = new CComponentsFrmChain(CC_CENTERED, CC_APPEND, w_seg, h_seg_obj, NULL, CC_DIR_Y, this, false); sb_segments_obj = new CComponentsFrmChain(CC_CENTERED, CC_APPEND, w_seg, h_seg_obj, NULL, CC_DIR_Y, this, false);
sb_segments_obj->setFrameThickness(0/*,0*/); sb_segments_obj->setFrameThickness(0);
sb_segments_obj->setAppendOffset(0, 3);
}else }else
sb_segments_obj->setDimensionsAll(CC_CENTERED, CC_APPEND, w_seg, h_seg_obj); sb_segments_obj->setDimensionsAll(CC_CENTERED, CC_APPEND, w_seg, h_seg_obj);
@@ -153,9 +155,9 @@ void CComponentsScrollBar::initSegments()
sb_segments_obj->clear(); sb_segments_obj->clear();
//set y position of 1st segment and set height of segments //set y position of 1st segment and set height of segments
int y_seg = 1+ append_y_offset; int y_seg = append_y_offset;
int h_seg = sb_segments_obj->getHeight()/sb_segments_count - append_y_offset; int h_seg = sb_segments_obj->getHeight()/sb_segments_count - append_y_offset;
if(h_seg < 0) if (h_seg < 0)
h_seg = 0; h_seg = 0;
//create and add segments to segment container //create and add segments to segment container