From d4987e77838f6a401b1c61dd232e2e8d879a8cef Mon Sep 17 00:00:00 2001 From: taeyoon Date: Sat, 18 Jun 2016 13:36:53 +0900 Subject: [PATCH] Revert "[3.0] temporary fix for build error" This reverts commit 8211986425e3db4eed2d4e6e6354c80f0f6aa730. Change-Id: I3907342f9d5d813310a939cf22bd91bd89e8cd13 --- adaptors/wayland/input/text/text-input-manager.cpp | 6 +++--- adaptors/wayland/input/text/text-input-manager.h | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/adaptors/wayland/input/text/text-input-manager.cpp b/adaptors/wayland/input/text/text-input-manager.cpp index 94c8ec2..e9a5fc7 100755 --- a/adaptors/wayland/input/text/text-input-manager.cpp +++ b/adaptors/wayland/input/text/text-input-manager.cpp @@ -373,11 +373,11 @@ void TextInputManager::Reset() wl_display_flush( mDisplay ); } -void TextInputManager::SetSurroundingText( std::string text, unsigned int cursor, unsigned int anchor ) +void TextInputManager::SetSurroundingText( uint32_t serial, std::string text, unsigned int cursor) { - //TextInputManager::SeatInfo& info = TextInputManager::Get().GetLastActiveSeat(); + TextInputManager::SeatInfo& info = TextInputManager::Get().GetLastActiveSeat(); - //wl_text_input_set_surrounding_text( info.mSeat->GetTextInputInterface(), text.c_str(), cursor, anchor ); + wl_text_input_set_surrounding_text( info.mSeat->GetTextInputInterface(), serial, text.c_str(), cursor); wl_display_flush( mDisplay ); } diff --git a/adaptors/wayland/input/text/text-input-manager.h b/adaptors/wayland/input/text/text-input-manager.h index 7033471..baa7da4 100755 --- a/adaptors/wayland/input/text/text-input-manager.h +++ b/adaptors/wayland/input/text/text-input-manager.h @@ -220,13 +220,11 @@ public: * UTF-8 encoded. Cursor is the byte offset within the * surrounding text. Anchor is the byte offset of the * selection anchor within the surrounding text. If there is no selected - * text anchor is the same as cursor. + * @param[in] serial the serial * @param[in] text the text * @param[in] cursor cursor position - * @param[in] anchor anchor position */ - void SetSurroundingText( std::string text, unsigned int cursor, unsigned int anchor ); - + void SetSurroundingText( uint32_t serial, std::string text, unsigned int cursor); public: // virtual keyboard signals -- 2.7.4