From 19fc8c6d3bd81cc25be26d6b5042277002be5bb0 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Thu, 27 Apr 2017 09:27:45 +0200
Subject: [PATCH] CComponentsForm: add member hideCCItems()

In case of items with cached background it is useful to have
possibility to restore their background. (eg. items are painted
outside of form).
---
 src/gui/components/cc_frm.cpp      |  6 ++++++
 src/gui/components/cc_frm.h        | 10 ++++++++++
 src/gui/components/cc_frm_header.h |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp
index c202c6742..bd1f4f555 100644
--- a/src/gui/components/cc_frm.cpp
+++ b/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;
diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h
index 3561e495a..59f488fdb 100644
--- a/src/gui/components/cc_frm.h
+++ b/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
diff --git a/src/gui/components/cc_frm_header.h b/src/gui/components/cc_frm_header.h
index 320c59282..9550d1134 100644
--- a/src/gui/components/cc_frm_header.h
+++ b/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);