Revert "[3.0] Notify multiline hint to IMF context"

This reverts commit 5391373eecd8b0afad4c54e6f4c0b6d3312c9425.

Change-Id: I75ccff44658e1ff74cc1ac6bbbc3f53d581c0f3e

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
index 11dfca9..e35ce05 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
@@ -267,10 +267,6 @@ const std::string& ImfManager::GetSurroundingText() const
   return Internal::Adaptor::ImfManager::GetImplementation(*this).GetSurroundingText();
 }
 
-void ImfManager::NotifyTextInputMultiLine( bool multiLine )
-{
-}
-
 ImfManager::ImfManagerSignalType& ImfManager::ActivatedSignal()
 {
   return Internal::Adaptor::ImfManager::GetImplementation(*this).ActivatedSignal();

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
index 7049354..d90e9d4 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
@@ -212,11 +212,6 @@ public:
    */
   const std::string& GetSurroundingText() const;
 
-  /**
-  * @brief Notifies IMF context that text input is set to multi line or not
-  */
-  void NotifyTextInputMultiLine( bool multiLine );
-
 public:
 
   // Signals

diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/text-controller-impl.cpp
index 849eb26..14670ae 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/dali-toolkit/internal/text/text-controller-impl.cpp
@@ -307,15 +307,6 @@ void Controller::Impl::NotifyImfManager()
   }
 }
 
-void Controller::Impl::NotifyImfMultiLineStatus()
-{
-  if ( mEventData )
-  {
-    LayoutEngine::Layout layout = mLayoutEngine.GetLayout();
-    mEventData->mImfManager.NotifyTextInputMultiLine( layout == LayoutEngine::MULTI_LINE_BOX );
-  }
-}
-
 CharacterIndex Controller::Impl::GetLogicalCursorPosition() const
 {
   CharacterIndex cursorPosition = 0u;

diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h
index f47fd54..b220be6 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-impl.h
+++ b/dali-toolkit/internal/text/text-controller-impl.h
@@ -439,11 +439,6 @@ struct Controller::Impl
   void NotifyImfManager();
 
   /**
-   * @brief Helper to notify IMF manager with multi line status.
-   */
-  void NotifyImfMultiLineStatus();
-
-  /**
    * @brief Retrieve the current cursor position.
    *
    * @return The cursor position.

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index 0b0b77d..dbbf523 100644 (file)
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -1992,7 +1992,7 @@ void Controller::KeyboardFocusGainEvent()
       mImpl->ChangeState( EventData::EDITING );
       mImpl->mEventData->mUpdateCursorPosition = true; //If editing started without tap event, cursor update must be triggered.
     }
-    mImpl->NotifyImfMultiLineStatus();
+
     if( mImpl->IsShowingPlaceholderText() )
     {
       // Show alternative placeholder-text when editing