Revert "[Tizen] Modify window configure notification event callback"

This reverts commit 935c0efc8a8f559eb3afad650e302219032fff24.

diff --git a/dali/internal/window-system/common/window-base.cpp b/dali/internal/window-system/common/window-base.cpp
index 659ad2c..867b72a 100644 (file)
--- a/dali/internal/window-system/common/window-base.cpp
+++ b/dali/internal/window-system/common/window-base.cpp
@@ -39,8 +39,7 @@ WindowBase::WindowBase()
   mStyleChangedSignal(),
   mAccessibilitySignal(),
   mTransitionEffectEventSignal(),
-  mKeyboardRepeatSettingsChangedSignal(),
-  mUpdatePositionSizeSignal()
+  mKeyboardRepeatSettingsChangedSignal()
 {
 }
 
@@ -128,12 +127,6 @@ WindowBase::WindowRedrawRequestSignalType& WindowBase::WindowRedrawRequestSignal
   return mWindowRedrawRequestSignal;
 }
 
-WindowBase::UpdatePositionSizeType& WindowBase::UpdatePositionSizeSignal()
-{
-  return mUpdatePositionSizeSignal;
-}
-
-
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/dali/internal/window-system/common/window-base.h b/dali/internal/window-system/common/window-base.h
index 0c0d896..62a70ed 100644 (file)
--- a/dali/internal/window-system/common/window-base.h
+++ b/dali/internal/window-system/common/window-base.h
@@ -72,7 +72,6 @@ public:
   typedef Signal<void(WindowEffectState, WindowEffectType)> TransitionEffectEventSignalType;
   typedef Signal<void()>                                    KeyboardRepeatSettingsChangedSignalType;
   typedef Signal<void()>                                    WindowRedrawRequestSignalType;
-  typedef Signal<void(Dali::PositionSize&)>                 UpdatePositionSizeType;
 
   // Input events
   typedef Signal<void(Integration::Point&, uint32_t)> TouchEventSignalType;
@@ -436,11 +435,6 @@ public:
    */
   WindowRedrawRequestSignalType& WindowRedrawRequestSignal();
 
-  /**
-   * @brief This signal is emitted when the window is resized or moved by display server.
-   */
-  UpdatePositionSizeType& UpdatePositionSizeSignal();
-
 protected:
   // Undefined
   WindowBase(const WindowBase&) = delete;
@@ -465,8 +459,6 @@ protected:
   TransitionEffectEventSignalType         mTransitionEffectEventSignal;
   KeyboardRepeatSettingsChangedSignalType mKeyboardRepeatSettingsChangedSignal;
   WindowRedrawRequestSignalType           mWindowRedrawRequestSignal;
-  UpdatePositionSizeType                  mUpdatePositionSizeSignal;
-
 };
 
 } // namespace Adaptor

diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index 69e75de..fe37203 100644 (file)
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -79,6 +79,7 @@ Window::Window()
   mIsFocusAcceptable(true),
   mIconified(false),
   mOpaqueState(false),
+  mResizeEnabled(false),
   mType(WindowType::NORMAL),
   mParentWindow(NULL),
   mPreferredAngle(static_cast<int>(WindowOrientation::NO_ORIENTATION_PREFERENCE)),
@@ -131,11 +132,14 @@ void Window::Initialize(Any surface, const PositionSize& positionSize, const std
   mWindowBase->TransitionEffectEventSignal().Connect(this, &Window::OnTransitionEffectEvent);
   mWindowBase->KeyboardRepeatSettingsChangedSignal().Connect(this, &Window::OnKeyboardRepeatSettingsChanged);
   mWindowBase->WindowRedrawRequestSignal().Connect(this, &Window::OnWindowRedrawRequest);
-  mWindowBase->UpdatePositionSizeSignal().Connect(this, &Window::OnUpdatePositionSize);
 
   mWindowSurface->OutputTransformedSignal().Connect(this, &Window::OnOutputTransformed);
 
-  AddAuxiliaryHint("wm.policy.win.user.geometry", "1");
+  if(!positionSize.IsEmpty())
+  {
+    AddAuxiliaryHint("wm.policy.win.user.geometry", "1");
+    mResizeEnabled = true;
+  }
 
   SetClass(name, className);
 
@@ -575,6 +579,12 @@ int Window::GetBrightness() const
 
 void Window::SetSize(Dali::Window::WindowSize size)
 {
+  if(!mResizeEnabled)
+  {
+    AddAuxiliaryHint("wm.policy.win.user.geometry", "1");
+    mResizeEnabled = true;
+  }
+
   PositionSize oldRect = mSurface->GetPositionSize();
 
   mWindowSurface->MoveResize(PositionSize(oldRect.x, oldRect.y, size.GetWidth(), size.GetHeight()));
@@ -610,6 +620,12 @@ Dali::Window::WindowSize Window::GetSize() const
 
 void Window::SetPosition(Dali::Window::WindowPosition position)
 {
+  if(!mResizeEnabled)
+  {
+    AddAuxiliaryHint("wm.policy.win.user.geometry", "1");
+    mResizeEnabled = true;
+  }
+
   PositionSize oldRect = mSurface->GetPositionSize();
 
   mWindowSurface->MoveResize(PositionSize(position.GetX(), position.GetY(), oldRect.width, oldRect.height));
@@ -626,6 +642,12 @@ Dali::Window::WindowPosition Window::GetPosition() const
 
 void Window::SetPositionSize(PositionSize positionSize)
 {
+  if(!mResizeEnabled)
+  {
+    AddAuxiliaryHint("wm.policy.win.user.geometry", "1");
+    mResizeEnabled = true;
+  }
+
   PositionSize oldRect = mSurface->GetPositionSize();
 
   mWindowSurface->MoveResize(positionSize);
@@ -774,11 +796,6 @@ void Window::OnWindowRedrawRequest()
   mAdaptor->RenderOnce();
 }
 
-void Window::OnUpdatePositionSize(Dali::PositionSize& positionSize)
-{
-  SetPositionSize(positionSize);
-}
-
 void Window::OnTouchPoint(Dali::Integration::Point& point, int timeStamp)
 {
   FeedTouchPoint(point, timeStamp);

diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h
index 7b20b58..cb27eb1 100644 (file)
--- a/dali/internal/window-system/common/window-impl.h
+++ b/dali/internal/window-system/common/window-impl.h
@@ -434,13 +434,6 @@ private:
   void OnWindowRedrawRequest();
 
   /**
-   * @brief Called when the window is resized or moved by display server.
-   *
-   * @param positionSize the updated window's position and size.
-   */
-  void OnUpdatePositionSize(Dali::PositionSize& positionSize);
-
-  /**
    * @brief Set available orientation to window base.
    */
   void SetAvailableAnlges(const std::vector<int>& angles);
@@ -573,6 +566,7 @@ private:
   bool                 mIsFocusAcceptable : 1;
   bool                 mIconified : 1;
   bool                 mOpaqueState : 1;
+  bool                 mResizeEnabled : 1;
   WindowType           mType;
   Dali::Window         mParentWindow;
 

diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp
index 98afcfc..b5fffa8 100644 (file)
--- a/dali/internal/window-system/common/window-render-surface.cpp
+++ b/dali/internal/window-system/common/window-render-surface.cpp
@@ -344,15 +344,15 @@ void WindowRenderSurface::MoveResize(Dali::PositionSize positionSize)
   bool needToResize = false;
 
   // Check moving
-  if((fabs(positionSize.x - mPositionSize.x) >= MINIMUM_DIMENSION_CHANGE) ||
-     (fabs(positionSize.y - mPositionSize.y) >= MINIMUM_DIMENSION_CHANGE))
+  if((fabs(positionSize.x - mPositionSize.x) > MINIMUM_DIMENSION_CHANGE) ||
+     (fabs(positionSize.y - mPositionSize.y) > MINIMUM_DIMENSION_CHANGE))
   {
     needToMove = true;
   }
 
   // Check resizing
-  if((fabs(positionSize.width - mPositionSize.width) >= MINIMUM_DIMENSION_CHANGE) ||
-     (fabs(positionSize.height - mPositionSize.height) >= MINIMUM_DIMENSION_CHANGE))
+  if((fabs(positionSize.width - mPositionSize.width) > MINIMUM_DIMENSION_CHANGE) ||
+     (fabs(positionSize.height - mPositionSize.height) > MINIMUM_DIMENSION_CHANGE))
   {
     needToResize = true;
   }

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
index f54c22b..4c91c35 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
@@ -1004,40 +1004,10 @@ void WindowBaseEcoreWl2::OnConfiguration(void* data, int type, void* event)
 {
   Ecore_Wl2_Event_Window_Configure* ev(static_cast<Ecore_Wl2_Event_Window_Configure*>(event));
 
-  if(ev && ev->win == static_cast<unsigned int>(ecore_wl2_window_id_get(mEcoreWindow)))
+  if(ev->win == static_cast<unsigned int>(ecore_wl2_window_id_get(mEcoreWindow)))
   {
     // Note: To comply with the wayland protocol, Dali should make an ack_configure
     // by calling ecore_wl2_window_commit
-
-    int tempWidth  = static_cast<int>(ev->w);
-    int tempHeight = static_cast<int>(ev->h);
-
-    // Initialize with previous size for skip resize when new size is 0.
-    // When window is just moved or window is resized by client application,
-    // The configure notification event's size will be 0.
-    // If new size is 0, the resized work should be skip.
-    int newWidth = mWindowPositionSize.width;
-    int newHeight = mWindowPositionSize.height;
-    bool windowMoved = false, windowResized = false;
-
-    if(ev->x != mWindowPositionSize.x || ev->y != mWindowPositionSize.y)
-    {
-      windowMoved = true;
-    }
-
-    if(tempWidth != 0 && tempHeight != 0 && (tempWidth != mWindowPositionSize.width || tempHeight != mWindowPositionSize.height))
-    {
-      windowResized = true;
-      newWidth = tempWidth;
-      newHeight = tempHeight;
-    }
-
-    if(windowMoved || windowResized)
-    {
-      Dali::PositionSize newPositionSize(ev->x, ev->y, newWidth, newHeight);
-      mUpdatePositionSizeSignal.Emit(newPositionSize);
-    }
-
     ecore_wl2_window_commit(mEcoreWindow, EINA_FALSE);
   }
 }