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

Origin commit data
------------------
Commit: 8719bddc6a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-27 (Thu, 27 Apr 2017)

src/gui/components/cc_frm.cpp

@@ -532,6 +532,12 @@ void CComponentsForm::killCCItems(const fb_pixel_t& bg_color, bool ignore_parent
 		v_cc_items[i]->kill(bg_color, ignore_parent);
 }
 
+void CComponentsForm::hideCCItems()
+{
+	for(size_t i=0; i<v_cc_items.size(); i++)
+		v_cc_items[i]->hide();
+}
+
 void CComponentsForm::setPageCount(const u_int8_t& pageCount)
 {
 	u_int8_t new_val = pageCount;

src/gui/components/cc_frm.h

@@ -81,6 +81,16 @@ class CComponentsForm : public CComponentsItem
 		///NOTE: Items always have parent bindings to "this" and use the parent background color as default! Set parameter 'ignore_parent=true' to ignore parent background color!
 		virtual void killCCItems(const fb_pixel_t& bg_color, bool ignore_parent);
 
+		/**
+		 Removes possible contained items and finally removes
+		 current form from screen and
+		 restores last displayed background before form was painted.
+		*/
+		void hide(){hideCCItems(); CCDraw::hide();}
+
+		///restore background for all items inside form,
+		void hideCCItems();
+
 		///add an item to form collection, returns id
 		virtual int addCCItem(CComponentsItem* cc_Item);
 		///add items from a vector to form collection, returns size/count of items

src/gui/components/cc_frm_header.cpp

@@ -274,10 +274,10 @@ void CComponentsHeader::initIcon()
 
 void CComponentsHeader::initLogo()
 {
-	cch_logo.dy_max = cch_logo.dy_max == -1 ? height - 2*OFFSET_INNER_MIN : cch_logo.dy_max;
+	int h_logo = cch_logo.dy_max == -1 ? height - 2*OFFSET_INNER_MIN : cch_logo.dy_max;
 
 	if(!cch_logo_obj)
-		cch_logo_obj = new CComponentsChannelLogoScalable(width/2, height/2 - cch_logo.dy_max/2, cch_logo.Name, cch_logo.Id, this);
+		cch_logo_obj = new CComponentsChannelLogoScalable(width/2, height/2 - h_logo/2, cch_logo.Name, cch_logo.Id, this);
 	else
 		cch_logo_obj->setChannel(cch_logo.Id, cch_logo.Name);
 
@@ -285,12 +285,12 @@ void CComponentsHeader::initLogo()
 	if (cch_logo.dy_max == -1){
 		int dx_orig = 0, dy_orig = 0 ;
 		cch_logo_obj->getRealSize(&dx_orig, &dy_orig);
-		if (cch_logo.dy_max > dy_orig)
-			cch_logo.dy_max = dy_orig;
+		if (h_logo > dy_orig)
+			h_logo = dy_orig;
 	}
 
 	if (cch_logo_obj->hasLogo()){
-		cch_logo_obj->setHeight(cch_logo.dy_max, true);
+		cch_logo_obj->setHeight(h_logo, true);
 
 		// set id of logo item depends of neighbor items
 		int logo_id = getCCItemId(cch_logo_obj);

src/gui/components/cc_frm_header.h

@@ -299,7 +299,7 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
 		virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
 
 		///hides item, arg: no_restore see hideCCItem()
-		void hide(){disableClock(); CComponents::hide();}
+		void hide(){disableClock(); CComponentsForm::hide();}
 		///erase current screen without restore of background, it's similar to paintBackgroundBoxRel() from CFrameBuffer
 		void kill(const fb_pixel_t& bg_color = COL_BACKGROUND_PLUS_0, const int& corner_radius = -1, const int& fblayer_type = CC_FBDATA_TYPES, bool disable_clock = true);