Merge "Add FontClientPreCache API to FontClient" into devel/master

diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index a7a5e6c..98f3dbd 100644 (file)
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -731,7 +731,7 @@ void Window::SetPosition(Dali::Window::WindowPosition position)
   int32_t      newX    = position.GetX();
   int32_t      newY    = position.GetY();
 
-  mWindowSurface->MoveResize(PositionSize(newX, newY, oldRect.width, oldRect.height));
+  mWindowSurface->Move(PositionSize(newX, newY, oldRect.width, oldRect.height));
 
   if((oldRect.x != newX) || (oldRect.y != newY))
   {

diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp
index bfc4462..1337ff8 100644 (file)
--- a/dali/internal/window-system/common/window-render-surface.cpp
+++ b/dali/internal/window-system/common/window-render-surface.cpp
@@ -420,6 +420,16 @@ void WindowRenderSurface::UpdatePositionSize(Dali::PositionSize positionSize)
   }
 }
 
+void WindowRenderSurface::Move(Dali::PositionSize positionSize)
+{
+  mPositionSize.x = positionSize.x;
+  mPositionSize.y = positionSize.y;
+
+  DALI_LOG_RELEASE_INFO("Update Position by client (%d, %d)\n", positionSize.x, positionSize.y);
+
+  mWindowBase->Move(positionSize);
+}
+
 void WindowRenderSurface::MoveResize(Dali::PositionSize positionSize)
 {
   mPositionSize.x = positionSize.x;

diff --git a/dali/internal/window-system/common/window-render-surface.h b/dali/internal/window-system/common/window-render-surface.h
index a6643e6..6d9ed1b 100644 (file)
--- a/dali/internal/window-system/common/window-render-surface.h
+++ b/dali/internal/window-system/common/window-render-surface.h
@@ -140,6 +140,13 @@ public: // API
   void UpdatePositionSize(Dali::PositionSize positionSize);
 
   /**
+   * @brief Moves the window to the specified position.
+   *
+   * @param positionSize The new position of the window.
+   */
+  void Move(Dali::PositionSize positionSize);
+
+  /**
    * @brief This signal is emitted when the output is transformed.
    */
   OutputSignalType& OutputTransformedSignal();