From: Jihye Won <jihye.won1@samsung.com>
Date: Tue, 3 Nov 2015 06:51:28 +0000 (+0900)
Subject: Qt: destroy transWidget before offGuideImage shows
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~182
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2d9f973e7b9794e111294e0f51528cd12599cdd;p=sdk%2Femulator%2Fqemu.git

Qt: destroy transWidget before offGuideImage shows

When emulator does not receive any event,
offGuideImage is loaded on the top of the screen.
The problem is that offGuideImage shows with transparent widget
created for Move function.
To resolve the problem, transparent widget should be deleted
just before offGuidImage shows.

Change-Id: Ia2ceb186034d4e37bff3c1f22c206202a20b7e8b
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
---

diff --git a/tizen/src/ui/displaybase.cpp b/tizen/src/ui/displaybase.cpp
index cbf9ea40ba..50a46b6a12 100644
--- a/tizen/src/ui/displaybase.cpp
+++ b/tizen/src/ui/displaybase.cpp
@@ -96,6 +96,13 @@ bool DisplayBase::isOffGuideReady()
 
 void DisplayBase::showOffGuideImg()
 {
+    /* destroy transparent widget before OffGuideImage shows */
+    TransWidget *widget = win->getTransWidget();
+    if (widget != NULL) {
+        qDebug() << "move: delete transparent widget because of offGuideImg";
+        delete widget;
+    }
+
     offGuideShown = true;
 
     offGuide = new QLabel(win);
diff --git a/tizen/src/ui/transwidget.cpp b/tizen/src/ui/transwidget.cpp
index ba7ef4abe1..88becb6b2e 100644
--- a/tizen/src/ui/transwidget.cpp
+++ b/tizen/src/ui/transwidget.cpp
@@ -99,10 +99,6 @@ TransWidget::~TransWidget()
 {
     qDebug("destroy transparent widget");
     removeEventFilter(this);
-    MainWindow *parent = qobject_cast<MainWindow*>(this->parent());
-    if (parent == NULL) {
-        qWarning() << "parent object(MainWindow) is null.";
-    } else {
-        parent->setTransWidget(NULL);
-    }
+    MainWindow *parent = (MainWindow *)(this->parent());
+    parent->setTransWidget(NULL);
 }