Merge branch 'master' into pu/mp

This commit is contained in:
M. Liebmann
2017-09-21 09:07:15 +02:00
19 changed files with 236 additions and 100 deletions

View File

@@ -58,7 +58,7 @@ class CComponentsFrmClock : public CComponentsForm, public CCTextScreen
int cl_interval;
///raw time chars
char cl_timestr[20];
char cl_timestr[32];
///handle paint clock within thread and is not similar to cc_allow_paint
bool paintClock;

View File

@@ -155,7 +155,7 @@ void CComponentsScrollBar::initSegments()
//init segment container
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->setFrameThickness(0);
sb_segments_obj->setFrameThickness(FRAME_WIDTH_NONE);
}else
sb_segments_obj->setDimensionsAll(CC_CENTERED, CC_APPEND, w_seg, h_seg_obj);

View File

@@ -451,7 +451,7 @@ void CProgressBar::paintProgress(bool do_save_bg)
pb_green /= sum;
if (*pb_gradient)
setFrameThickness(0);
setFrameThickness(FRAME_WIDTH_NONE);
initDimensions();