Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Origin commit data
------------------
Commit: ac183e3927
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)

src/gui/components/cc_draw.cpp

@@ -678,7 +678,7 @@ void CCDraw::kill(const fb_pixel_t& bg_color, const int& corner_radius, const in
 							r,
 							corner_type);
 			}else
-				dprintf(DEBUG_NORMAL, "\033[33m[CCDraw][%s - %d], WARNING! render with bad dimensions [dx = %d dy = %d]\033[0m\n", __func__, __LINE__, v_fbdata[i].dx, v_fbdata[i].dy );
+				dprintf(DEBUG_DEBUG, "\033[33m[CCDraw][%s - %d], WARNING! render with bad dimensions [dx = %d dy = %d]\033[0m\n", __func__, __LINE__, v_fbdata[i].dx, v_fbdata[i].dy );
 
 			if (v_fbdata[i].frame_thickness)
 					frameBuffer->paintBoxFrame(v_fbdata[i].x,

src/gui/components/cc_frm_scrollbar.cpp

@@ -81,6 +81,7 @@ void CComponentsScrollBar::initVarSbForm(const int& count)
 
 	sb_up_obj 	= sb_down_obj = NULL;
 	sb_segments_obj = NULL;
+	setCorner(RADIUS_MIN, CORNER_ALL);
 
 	sb_up_icon	= frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_UP) ;
 	sb_down_icon	= frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_DOWN);
@@ -110,22 +111,20 @@ 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 = new CComponentsPicture(CC_CENTERED, fr_thickness, width-2*fr_thickness, width-2*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);
 }
 
 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 = new CComponentsPicture(CC_CENTERED, height - width-2*fr_thickness, width-2*fr_thickness, 0, sb_down_icon, this);
 		sb_down_obj->SetTransparent(CFrameBuffer::TM_BLACK);
 		sb_down_obj->doPaintBg(false);
 	}
-	sb_down_obj->setWidth(width-2*fr_thickness);
 }
 
 void CComponentsScrollBar::initSegments()
@@ -189,3 +188,20 @@ void CComponentsScrollBar::initSegments()
 	sb_segments_obj->front()->setCorner(RADIUS_MIN, CORNER_TOP);
 	sb_segments_obj->back()->setCorner(RADIUS_MIN, CORNER_BOTTOM);
 }
+
+
+void paintScrollBar(	const int &x_pos,
+			const int &y_pos,
+			const int &w,
+			const int &h,
+			const int& count,
+			const int& current_num,
+			int shadow_mode,
+			fb_pixel_t color_frame,
+			fb_pixel_t color_body,
+			fb_pixel_t color_shadow)
+{
+	CComponentsScrollBar scrollbar(x_pos, y_pos, w, h, count, NULL, shadow_mode, color_frame, color_body, color_shadow);
+	scrollbar.setMarkID(current_num);
+	scrollbar.paint0();
+}

src/gui/components/cc_frm_scrollbar.h

@@ -60,24 +60,95 @@ class CComponentsScrollBar : public CComponentsFrmChain
 		void initVarSbForm(	const int& count);
 
 	public:
-		CComponentsScrollBar(	const int &x_pos, const int &y_pos, const int &w = 15, const int &h = 40,
+		/**Class constructor to generate individual scrollbar objects
-					const int& count = 1,
+		 *
+		 * @param[in] x_pos		exepts type int, x position on screen
+		 * @param[in] x_pos		exepts type int, y position on screen modes are:
+		 * @param[in] w			exepts type int, width of scrollbar object
+		 * @param[in] h			exepts type int, height of scrollbar object
+		 * @param[in] count		optional, exepts type int, count of pages, default 1
+		 *
+		 * usual paraemters:
+		 * @param[in] parent		optional, exepts type pointer to a parent CComponentsForm object, default NULL
+		 * @param[in] shadow_mode	optional, exepts type int defined by shadow mode enums, default CC_SHADOW_OFF
+		 * @param[in] color_frame	optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE_PLUS_0
+		 * @param[in] color_body	optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE_PLUS_0
+		 * @param[in] color_shadow	optional, exepts type fb_pixel_t, default COL_SHADOW_PLUS_0
+		*/
+		CComponentsScrollBar(	const int &x_pos,
+					const int &y_pos,
+					const int &w 		= 15,
+					const int &h 		= 40,
+					const int& count 	= 1,
 					CComponentsForm *parent = NULL,
-					int shadow_mode = CC_SHADOW_OFF,
+					int shadow_mode 	= CC_SHADOW_OFF,
-					fb_pixel_t color_frame = COL_SCROLLBAR_ACTIVE_PLUS_0,
+					fb_pixel_t color_frame 	= COL_SCROLLBAR_ACTIVE_PLUS_0,
-					fb_pixel_t color_body = COL_SCROLLBAR_PASSIVE_PLUS_0,
+					fb_pixel_t color_body 	= COL_SCROLLBAR_PASSIVE_PLUS_0,
 					fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
 // 		~CComponentsScrollBar(); //inherited from CComponentsForm
 
-		///set marked segment, 1st = 0, 2nd = 1 ...
+		/**Set current page number
-		void setMarkID(const int& mark_id){sb_mark_id = mark_id; initSegments();};
+		 * @return 			void
-		///get current assigned marked id
+		 *
+		 * @param[in] mark_id		exepts type int, this sets the current selected page number.
+		 *
+		 * @see				getMarkID()
+		*/
+		void setMarkID(const int& mark_id){sb_mark_id = mark_id; initSegments();}
+
+		/**Gets current page number
+		 * @return 			int
+		 *
+		 * @see				setMarkID()
+		*/
 		int getMarkID(){return sb_mark_id;};
 
-		///Sets count of scrollbar segments and is similar e.g. page count. Each segment is assigned to an id.  Starting with id 0...n see also setMarkID(), getMarkID().
+		/**Sets count of possible scrollbar segments (e.g. page count) and
+		 * current selected page at once .
+		 * Each segment is assigned to a page number. Starting with id 0...n
+		 * @return 			void
+		 *
+		 * @param[in] segment_count	exepts type int, sets the current count of pages.
+		 * @param[in] mark_id		optional, exepts type int, sets the current selected page number, default = 0
+		 * @see				also setMarkID()
+		 * 				getMarkID()
+		*/
 		void setSegmentCount(const int& segment_count, const int& mark_id = 0);
-		///Get count of current scrollbar segments
+
+		/**Get count of current scrollbar segments (page count)
+		 * @return 			int
+		 *
+		 * @see				setSegmentCount()
+		*/
 		int getSegmentCount(){return sb_segments_count;}
 };
 
+		/**Small and easy to apply scrollbar paint methode without expilcit object declaration
+		* @return 			void
+		*
+		* @param[in] x_pos		exepts type int, x position on screen
+		* @param[in] x_pos		exepts type int, y position on screen modes are:
+		* @param[in] w			exepts type int, width of scrollbar object
+		* @param[in] h			exepts type int, height of scrollbar object
+		* @param[in] count		exepts type int, count of pages, default 1
+		* @param[in] current_num	exepts type int, current selected page, default 0
+		*
+		* usual paraemters:
+		* @param[in] parent		optional, exepts type pointer to a parent CComponentsForm object, default NULL
+		* @param[in] shadow_mode	optional, exepts type int defined by shadow mode enums, default CC_SHADOW_OFF
+		* @param[in] color_frame	optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE_PLUS_0
+		* @param[in] color_body		optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE_PLUS_0
+		* @param[in] color_shadow	optional, exepts type fb_pixel_t, default COL_SHADOW_PLUS_0
+		*/
+void paintScrollBar(	const int &x_pos,
+			const int &y_pos,
+			const int &w,
+			const int &h,
+			const int& count,
+			const int& current_num,
+			int shadow_mode 	= CC_SHADOW_OFF,
+			fb_pixel_t color_frame 	= COL_SCROLLBAR_ACTIVE_PLUS_0,
+			fb_pixel_t color_body 	= COL_SCROLLBAR_PASSIVE_PLUS_0,
+			fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
+
 #endif