Revert "[3.0] Fixed Window::ShowIndicator(INVISIBLE)"

This reverts commit cb123490953176fe061dc8757ac7fa6638450b39.

Change-Id: I0dd351ed48c3bc8485564b08ac52d1385a2df544

diff --git a/adaptors/ecore/common/ecore-indicator-impl.cpp b/adaptors/ecore/common/ecore-indicator-impl.cpp
index b33cd12..fb60098 100644 (file)
--- a/adaptors/ecore/common/ecore-indicator-impl.cpp
+++ b/adaptors/ecore/common/ecore-indicator-impl.cpp
@@ -666,10 +666,6 @@ void Indicator::SetVisible( Dali::Window::IndicatorVisibleMode visibleMode, bool
         ShowIndicator( HIDE_NOW );
       }
     }
-    else
-    {
-      mIsShowing = false;
-    }
   }
 }
 
@@ -955,7 +951,19 @@ void Indicator::LoadSharedImage( Ecore_Ipc_Event_Server_Data *epcEvent )
       }
 
       CreateNewImage( n );
-      UpdateVisibility();
+
+      if( CheckVisibleState() )
+      {
+        // set default indicator type (enable the quick panel)
+        OnIndicatorTypeChanged( INDICATOR_TYPE_1 );
+      }
+      else
+      {
+        // set default indicator type (disable the quick panel)
+        OnIndicatorTypeChanged( INDICATOR_TYPE_2 );
+      }
+
+      SetVisible(mVisible);
     }
   }
 }
@@ -978,29 +986,20 @@ void Indicator::LoadPixmapImage( Ecore_Ipc_Event_Server_Data *epcEvent )
     DALI_LOG_INFO( gIndicatorLogFilter, Debug::General, "mPixmap [%x]", mPixmap);
 
     CreateNewPixmapImage();
-    UpdateVisibility();
-  }
-}
 
-void Indicator::UpdateVisibility()
-{
-  if( CheckVisibleState() )
-  {
-    // set default indicator type (enable the quick panel)
-    OnIndicatorTypeChanged( INDICATOR_TYPE_1 );
-  }
-  else
-  {
-    // set default indicator type (disable the quick panel)
-    OnIndicatorTypeChanged( INDICATOR_TYPE_2 );
-  }
+    if( CheckVisibleState() )
+    {
+      // set default indicator type (enable the quick panel)
+      OnIndicatorTypeChanged( INDICATOR_TYPE_1 );
+    }
+    else
+    {
+      // set default indicator type (disable the quick panel)
+      OnIndicatorTypeChanged( INDICATOR_TYPE_2 );
+    }
 
-  if( !mIsShowing )
-  {
-    mIndicatorContentActor.SetPosition( 0.0f, -mImageHeight, 0.0f );
+    SetVisible(mVisible);
   }
-
-  SetVisible(mVisible, true);
 }
 
 void Indicator::UpdateImageData( int bufferNumber )
@@ -1364,6 +1363,7 @@ void Indicator::DataReceived( void* event )
             }
             break;
           }
+
         }
       }
       break;

diff --git a/adaptors/ecore/common/ecore-indicator-impl.h b/adaptors/ecore/common/ecore-indicator-impl.h
index 53e93d1..4493113 100644 (file)
--- a/adaptors/ecore/common/ecore-indicator-impl.h
+++ b/adaptors/ecore/common/ecore-indicator-impl.h
@@ -290,11 +290,6 @@ private:
   void LoadPixmapImage( Ecore_Ipc_Event_Server_Data *epcEvent );
 
   /**
-   * Update the visibility and position of the actors
-   */
-  void UpdateVisibility();
-
-  /**
    * Inform dali that the indicator data has been updated.
    * @param[in] bufferNumber The shared file number
    */