Qt: offGuideImage hides while Move function is active

So far, Move function is canceled just before offGuideImage shows
while a user activate the function.
For improving user experience of using Move function,
offGuideImage hides while Move function is active.
Therefore, the user can move Emulator without interruption of offGuideImage

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

diff --git a/tizen/src/ui/displaybase.cpp b/tizen/src/ui/displaybase.cpp
index 50a46b6a12881b865d849bd9eace5ba33fbdbe31..cbf9ea40ba692d4eb6fabeae59a1484f5507b8c7 100644 (file)
--- a/tizen/src/ui/displaybase.cpp
+++ b/tizen/src/ui/displaybase.cpp
@@ -96,13 +96,6 @@ 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/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp
index 82b32fcdec782728ea101f4e4531352253a74cb7..56b11de4e73839808b8d103618bb68793140b9e9 100644 (file)
--- a/tizen/src/ui/mainwindow.cpp
+++ b/tizen/src/ui/mainwindow.cpp
@@ -582,3 +582,10 @@ TransWidget *MainWindow::getTransWidget()
     return this->transWidget;
 }
 
+bool MainWindow::isTransWidgetCreated()
+{
+    if (this->transWidget == NULL) {
+        return false;
+    }
+    return true;
+}

diff --git a/tizen/src/ui/mainwindow.h b/tizen/src/ui/mainwindow.h
index eac994a9b07da0d0309593856b2b83685ec3f639..b23522fc3895001a57d9527353d203e84fff60ac 100644 (file)
--- a/tizen/src/ui/mainwindow.h
+++ b/tizen/src/ui/mainwindow.h
@@ -86,6 +86,7 @@ public:
     void createTransWidget();
     void setTransWidget(TransWidget *widget);
     TransWidget *getTransWidget();
+    bool isTransWidgetCreated();
 
 public slots:
     void slotContextMenu(const QPoint &pos);

diff --git a/tizen/src/ui/qt5_supplement.cpp b/tizen/src/ui/qt5_supplement.cpp
index 5d722d2604b13b3439a36b34d605052f917cdd1d..cb681950e7ed91833a546d76fd80064810aaafb4 100644 (file)
--- a/tizen/src/ui/qt5_supplement.cpp
+++ b/tizen/src/ui/qt5_supplement.cpp
@@ -374,10 +374,13 @@ void qt5_refresh_internal(void)
     DisplayBase *display = mainwindow->getDisplay();
     if (display && display->isOffGuideReady() == true) {
         if (is_display_off() == true) {
-            /* show guide image for display off */
+            /* show guide image for display off
+               only if Move function is not active */
             if (display->isOffGuideShown() == false) {
                 if (dpy_blank_cnt > MAX_DPY_BLANK_FRAME_CNT) {
-                    display->showOffGuideImg();
+                    if (mainwindow->isTransWidgetCreated() == false) {
+                        display->showOffGuideImg();
+                    }
                     dpy_blank_cnt = 0;
                 } else {
                     dpy_blank_cnt++;