From: Heeyong Song Date: Tue, 12 Nov 2019 06:27:06 +0000 (+0900) Subject: Revert "[Tizen] Add Preedit style - Highlight and Reverse" X-Git-Tag: submit/tizen_5.5/20191113.050208~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39787950b42b2c0a23f76ac191da46816f9e8387;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Revert "[Tizen] Add Preedit style - Highlight and Reverse" This reverts commit 75d1233b42b43754e1cb123e7352d499888ae5c8. --- diff --git a/dali/devel-api/adaptor-framework/input-method-context.cpp b/dali/devel-api/adaptor-framework/input-method-context.cpp index 854134c..0b8e3f7 100755 --- a/dali/devel-api/adaptor-framework/input-method-context.cpp +++ b/dali/devel-api/adaptor-framework/input-method-context.cpp @@ -221,11 +221,6 @@ void InputMethodContext::SetInputPanelPosition( unsigned int x, unsigned int y ) Internal::Adaptor::InputMethodContext::GetImplementation(*this).SetInputPanelPosition( x, y ); } -Dali::InputMethodContext::PreeditStyle InputMethodContext::GetPreeditStyle() const -{ - return Internal::Adaptor::InputMethodContext::GetImplementation(*this).GetPreeditStyle(); -} - // Signals InputMethodContext::ActivatedSignalType& InputMethodContext::ActivatedSignal() { diff --git a/dali/devel-api/adaptor-framework/input-method-context.h b/dali/devel-api/adaptor-framework/input-method-context.h index 3eb5553..85f754a 100755 --- a/dali/devel-api/adaptor-framework/input-method-context.h +++ b/dali/devel-api/adaptor-framework/input-method-context.h @@ -90,9 +90,6 @@ public: HARDWARE_KEYBOARD ///< Hardware keyboard }; - /** - * @brief Enumeration for the language mode of the input panel. - */ enum class InputPanelLanguage { AUTOMATIC, ///< IME Language automatically set depending on the system display @@ -100,17 +97,6 @@ public: }; /** - * @brief Enumeration for the preedit style types. - */ - enum class PreeditStyle - { - NONE, ///< None style - UNDERLINE, ///< Underline substring style - REVERSE, ///< Reverse substring style - HIGHLIGHT ///< Highlight substring style - }; - - /** * @brief This structure is used to pass on data from the InputMethodContext regarding predictive text. */ struct EventData @@ -475,13 +461,6 @@ public: */ void SetInputPanelPosition( unsigned int x, unsigned int y ); - /** - * @brief Gets the preedit type. - * - * @return The preedit style type - */ - PreeditStyle GetPreeditStyle() const; - public: // Signals diff --git a/dali/internal/input/common/input-method-context-impl.h b/dali/internal/input/common/input-method-context-impl.h index e16cc44..eabc764 100755 --- a/dali/internal/input/common/input-method-context-impl.h +++ b/dali/internal/input/common/input-method-context-impl.h @@ -273,11 +273,6 @@ public: */ virtual void SetInputPanelPosition( unsigned int x, unsigned int y ) {} - /** - * @copydoc Dali::InputMethodContext::GetPreeditStyle() - */ - virtual Dali::InputMethodContext::PreeditStyle GetPreeditStyle() const { return Dali::InputMethodContext::PreeditStyle(); } - public: // Signals /** diff --git a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp index b597faf..3840b1e 100755 --- a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp +++ b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp @@ -324,7 +324,6 @@ InputMethodContextEcoreWl::InputMethodContextEcoreWl( Dali::Actor actor ) mSurroundingText(), mRestoreAfterFocusLost( false ), mIdleCallbackConnected( false ), - mPreeditType( Dali::InputMethodContext::PreeditStyle::NONE ), mWindowId( GetWindowIdFromActor( actor ) ) { ecore_imf_init(); @@ -511,34 +510,6 @@ void InputMethodContextEcoreWl::PreEditChanged( void*, ImfContext* imfContext, v // iterate through the list of attributes getting the type, start and end position. for ( l = attrs, (attr = static_cast( eina_list_data_get(l) ) ); l; l = eina_list_next(l), ( attr = static_cast( eina_list_data_get(l) ) )) { - switch( attr->preedit_type ) - { - case ECORE_IMF_PREEDIT_TYPE_NONE: - { - mPreeditType = Dali::InputMethodContext::PreeditStyle::NONE; - break; - } - case ECORE_IMF_PREEDIT_TYPE_SUB1: - { - mPreeditType = Dali::InputMethodContext::PreeditStyle::UNDERLINE; - break; - } - case ECORE_IMF_PREEDIT_TYPE_SUB2: - { - mPreeditType = Dali::InputMethodContext::PreeditStyle::REVERSE; - break; - } - case ECORE_IMF_PREEDIT_TYPE_SUB3: - { - mPreeditType = Dali::InputMethodContext::PreeditStyle::HIGHLIGHT; - break; - } - default: - { - break; - } - } - #ifdef DALI_PROFILE_UBUNTU if ( attr->preedit_type == ECORE_IMF_PREEDIT_TYPE_SUB3 ) // (Ecore_IMF) #else // DALI_PROFILE_UBUNTU @@ -1108,12 +1079,6 @@ void InputMethodContextEcoreWl::SetInputPanelPosition( unsigned int x, unsigned } } -Dali::InputMethodContext::PreeditStyle InputMethodContextEcoreWl::GetPreeditStyle() const -{ - DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextEcoreWl::GetPreeditStyle\n" ); - return mPreeditType; -} - bool InputMethodContextEcoreWl::ProcessEventKeyDown( const KeyEvent& keyEvent ) { bool eventHandled( false ); diff --git a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.h b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.h index 095e914..8e414d4 100755 --- a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.h +++ b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.h @@ -262,11 +262,6 @@ public: */ void SetInputPanelPosition( unsigned int x, unsigned int y ) override; - /** - * @copydoc Dali::InputMethodContext::GetPreeditStyle() - */ - Dali::InputMethodContext::PreeditStyle GetPreeditStyle() const override; - private: /** * Context created the first time and kept until deleted. @@ -345,7 +340,6 @@ private: std::vector mKeyEvents; ///< Stores key events to be sent from idle call-back. InputMethodOptions mOptions; - Dali::InputMethodContext::PreeditStyle mPreeditType; int mWindowId; }; diff --git a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp index 7ed1ab3..dcf53f2 100755 --- a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp +++ b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp @@ -148,8 +148,7 @@ InputMethodContextX::InputMethodContextX( Dali::Actor actor ) mIMFCursorPosition( 0 ), mSurroundingText(), mRestoreAfterFocusLost( false ), - mIdleCallbackConnected( false ), - mPreeditType( Dali::InputMethodContext::PreeditStyle::NONE ) + mIdleCallbackConnected( false ) { ecore_imf_init(); @@ -322,34 +321,6 @@ void InputMethodContextX::PreEditChanged( void*, ImfContext* imfContext, void* e // iterate through the list of attributes getting the type, start and end position. for ( l = attrs, (attr = static_cast( eina_list_data_get(l) ) ); l; l = eina_list_next(l), ( attr = static_cast( eina_list_data_get(l) ) )) { - switch( attr->preedit_type ) - { - case ECORE_IMF_PREEDIT_TYPE_NONE: - { - mPreeditType = Dali::InputMethodContext::PreeditStyle::NONE; - break; - } - case ECORE_IMF_PREEDIT_TYPE_SUB1: - { - mPreeditType = Dali::InputMethodContext::PreeditStyle::UNDERLINE; - break; - } - case ECORE_IMF_PREEDIT_TYPE_SUB2: - { - mPreeditType = Dali::InputMethodContext::PreeditStyle::REVERSE; - break; - } - case ECORE_IMF_PREEDIT_TYPE_SUB3: - { - mPreeditType = Dali::InputMethodContext::PreeditStyle::HIGHLIGHT; - break; - } - default: - { - break; - } - } - #ifdef DALI_PROFILE_UBUNTU if ( attr->preedit_type == ECORE_IMF_PREEDIT_TYPE_SUB3 ) // (Ecore_IMF) #else // DALI_PROFILE_UBUNTU @@ -819,12 +790,6 @@ void InputMethodContextX::SetInputPanelPosition( unsigned int x, unsigned int y // ecore_imf_context_input_panel_position_set() is supported from ecore-imf 1.21.0 version. } -Dali::InputMethodContext::PreeditStyle InputMethodContextX::GetPreeditStyle() const -{ - DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextX::GetPreeditStyle\n" ); - return mPreeditType; -} - bool InputMethodContextX::ProcessEventKeyDown( const KeyEvent& keyEvent ) { bool eventHandled( false ); diff --git a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.h b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.h index f3222d8..7edb8d8 100755 --- a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.h +++ b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.h @@ -268,11 +268,6 @@ public: */ void SetInputPanelPosition( unsigned int x, unsigned int y ) override; - /** - * @copydoc Dali::InputMethodContext::GetPreeditStyle() - */ - Dali::InputMethodContext::PreeditStyle GetPreeditStyle() const override; - private: /** * Context created the first time and kept until deleted. @@ -346,7 +341,6 @@ private: bool mRestoreAfterFocusLost:1; ///< Whether the keyboard needs to be restored (activated ) after focus regained. bool mIdleCallbackConnected:1; ///< Whether the idle callback is already connected. InputMethodOptions mOptions; - Dali::InputMethodContext::PreeditStyle mPreeditType; }; } // namespace Adaptor diff --git a/dali/internal/input/windows/input-method-context-impl-win.cpp b/dali/internal/input/windows/input-method-context-impl-win.cpp index 4cd4b65..5bd9b6f 100755 --- a/dali/internal/input/windows/input-method-context-impl-win.cpp +++ b/dali/internal/input/windows/input-method-context-impl-win.cpp @@ -62,8 +62,7 @@ InputMethodContextWin::InputMethodContextWin( Dali::Actor actor ) mIMFCursorPosition( 0 ), mSurroundingText(), mRestoreAfterFocusLost( false ), - mIdleCallbackConnected( false ), - mPreeditType( Dali::InputMethodContext::PreeditStyle::NONE ) + mIdleCallbackConnected( false ) { actor.OnStageSignal().Connect( this, &InputMethodContextWin::OnStaged ); @@ -365,12 +364,6 @@ void InputMethodContextWin::SetInputPanelPosition( unsigned int x, unsigned int DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::SetInputPanelPosition\n" ); } -Dali::InputMethodContext::PreeditStyle InputMethodContextWin::GetPreeditStyle() const -{ - DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::GetPreeditStyle\n" ); - return mPreeditType; -} - bool InputMethodContextWin::ProcessEventKeyDown( const KeyEvent& keyEvent ) { bool eventHandled( false ); diff --git a/dali/internal/input/windows/input-method-context-impl-win.h b/dali/internal/input/windows/input-method-context-impl-win.h index fffc088..61847a0 100755 --- a/dali/internal/input/windows/input-method-context-impl-win.h +++ b/dali/internal/input/windows/input-method-context-impl-win.h @@ -256,11 +256,6 @@ public: */ void SetInputPanelPosition( unsigned int x, unsigned int y ) override; - /** - * @copydoc Dali::InputMethodContext::GetPreeditStyle() - */ - Dali::InputMethodContext::PreeditStyle GetPreeditStyle() const override; - private: /** * Context created the first time and kept until deleted. @@ -319,7 +314,6 @@ private: bool mRestoreAfterFocusLost:1; ///< Whether the keyboard needs to be restored (activated ) after focus regained. bool mIdleCallbackConnected:1; ///< Whether the idle callback is already connected. InputMethodOptions mOptions; - Dali::InputMethodContext::PreeditStyle mPreeditType; }; } // namespace Adaptor