From: Hermet Park <hermet@hermet.pe.kr>
Date: Fri, 25 Mar 2016 10:55:16 +0000 (+0900)
Subject: deactivate menu when back key is pressed
X-Git-Tag: submit/tizen/20160617.075742~94
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16f770c5e2362989a31a135cd9bb58c3182e37d9;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git

deactivate menu when back key is pressed

Change-Id: I6268d013138a720e817ea356db715e7d59f9cf20
---

diff --git a/src/include/efl/mobile/ui_view.h b/src/include/efl/mobile/ui_view.h
index 0821e77..e3a1ccf 100644
--- a/src/include/efl/mobile/ui_view.h
+++ b/src/include/efl/mobile/ui_view.h
@@ -43,6 +43,7 @@ protected:
 	virtual void on_menu();
 	virtual void unload_content();
 	virtual void set_event_block(bool block);
+	virtual void on_back();
 
 public:
 	ui_view(ui_controller *controller, const char *name = NULL);
diff --git a/src/include/efl/ui_base_view.h b/src/include/efl/ui_base_view.h
index 904a303..6f23264 100644
--- a/src/include/efl/ui_base_view.h
+++ b/src/include/efl/ui_base_view.h
@@ -66,6 +66,18 @@ protected:
 	 */
 	virtual void set_event_block(bool block);
 
+	/** @brief This is for calling controller's rotate method.
+	 */
+	virtual void on_rotate(int degree);
+
+	/** @brief This is for calling controller's portrait method.
+	 */
+	virtual void on_portrait();
+
+	/** @brief This is for calling controller's landscape method.
+	 */
+	virtual void on_landscape();
+
 public:
 	///Constructor.
 	ui_base_view(ui_base_controller *controller, const char *name = NULL);
@@ -95,19 +107,9 @@ public:
 
 	/** @brief This is for calling controller's back method.
 	 */
+	//FIXME: public?
 	virtual void on_back();
 
-	/** @brief This is for calling controller's rotate method.
-	 */
-	virtual void on_rotate(int degree);
-
-	/** @brief This is for calling controller's portrait method.
-	 */
-	virtual void on_portrait();
-
-	/** @brief This is for calling controller's landscape method.
-	 */
-	virtual void on_landscape();
 	/** @brief Set the indicator mode.
 	 *
 	 *  @param indicator The mode to set, one of #ui_base_view_indicator.
diff --git a/src/lib/efl/mobile/ui_view.cpp b/src/lib/efl/mobile/ui_view.cpp
index 0a20510..5788c1e 100644
--- a/src/lib/efl/mobile/ui_view.cpp
+++ b/src/lib/efl/mobile/ui_view.cpp
@@ -114,6 +114,19 @@ bool ui_view::create_layout()
 	return true;
 }
 
+void ui_view::on_back()
+{
+	if (this->menu)
+	{
+		if (this->menu->is_activated())
+		{
+			this->menu->deactivate();
+			return;
+		}
+	}
+	ui_base_view ::on_back();
+}
+
 ui_view::ui_view(ui_controller *controller, const char *name)
 		: ui_base_view(controller, name), layout(NULL), menu(NULL)
 {