From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Tue, 12 May 2015 04:27:45 +0000 (+0900)
Subject: controller: no need to handle ESC key on floating controller
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~436^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ead079b9ac019b3bdce9091d0ef52c5d87870294;p=sdk%2Femulator%2Fqemu.git

controller: no need to handle ESC key on floating controller

If the user presses the Esc key in a dialog, QDialog::reject()
will be called. And it will cause the floating controller to close.
But this operation is not necessary for the emulator.
So, we override it as empty function.

Change-Id: Iede48e36e5b28401aa937aa9c55985c81cb4fcea
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

diff --git a/tizen/src/ui/controller/floatingcontroller.cpp b/tizen/src/ui/controller/floatingcontroller.cpp
index 46afedee4a..a80043d7ce 100644
--- a/tizen/src/ui/controller/floatingcontroller.cpp
+++ b/tizen/src/ui/controller/floatingcontroller.cpp
@@ -86,6 +86,8 @@ void FloatingController::setMask(const QRegion &region)
 
 /* override */
 void FloatingController::closeEvent(QCloseEvent *event) {
+    qDebug("close the floating controller");
+
     if (menu != NULL) {
         menu->setChecked(false);
     }
@@ -96,6 +98,12 @@ void FloatingController::closeEvent(QCloseEvent *event) {
     QWidget::closeEvent(event);
 }
 
+/* override */
+void FloatingController::reject()
+{
+    /* do nothing */
+}
+
 FloatingController::~FloatingController()
 {
     qDebug("destroy floating controller");
diff --git a/tizen/src/ui/controller/floatingcontroller.h b/tizen/src/ui/controller/floatingcontroller.h
index 5a778df094..f8a663415f 100644
--- a/tizen/src/ui/controller/floatingcontroller.h
+++ b/tizen/src/ui/controller/floatingcontroller.h
@@ -49,6 +49,7 @@ protected:
     void showEvent(QShowEvent *event);
     void setMask(const QRegion &region);
     void closeEvent(QCloseEvent *event);
+    void reject();
 
 private:
     FloatingConView *conView;