diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/lllineeditor.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp index 78fe29c..420970a 100644 --- a/linden/indra/llui/lllineeditor.cpp +++ b/linden/indra/llui/lllineeditor.cpp | |||
@@ -158,8 +158,7 @@ LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect, | |||
158 | mHandleEditKeysDirectly( FALSE ), | 158 | mHandleEditKeysDirectly( FALSE ), |
159 | mSelectAllonFocusReceived( FALSE ), | 159 | mSelectAllonFocusReceived( FALSE ), |
160 | mPassDelete(FALSE), | 160 | mPassDelete(FALSE), |
161 | mReadOnly(FALSE), | 161 | mReadOnly(FALSE) |
162 | mLastIMEPosition( -1, -1 ) | ||
163 | { | 162 | { |
164 | llassert( max_length_bytes > 0 ); | 163 | llassert( max_length_bytes > 0 ); |
165 | 164 | ||
@@ -1638,15 +1637,10 @@ void LLLineEditor::draw() | |||
1638 | S32 pixels_after_scroll = findPixelNearestPos(); // RCalculcate for IME position | 1637 | S32 pixels_after_scroll = findPixelNearestPos(); // RCalculcate for IME position |
1639 | LLRect screen_pos = getScreenRect(); | 1638 | LLRect screen_pos = getScreenRect(); |
1640 | LLCoordGL ime_pos( screen_pos.mLeft + pixels_after_scroll, screen_pos.mTop - UI_LINEEDITOR_V_PAD ); | 1639 | LLCoordGL ime_pos( screen_pos.mLeft + pixels_after_scroll, screen_pos.mTop - UI_LINEEDITOR_V_PAD ); |
1641 | if ( ime_pos.mX != mLastIMEPosition.mX || ime_pos.mY != mLastIMEPosition.mY ) | ||
1642 | { | ||
1643 | mLastIMEPosition.mX = ime_pos.mX; | ||
1644 | mLastIMEPosition.mY = ime_pos.mY; | ||
1645 | 1640 | ||
1646 | ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]); | 1641 | ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]); |
1647 | ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]); | 1642 | ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]); |
1648 | getWindow()->setLanguageTextInput( ime_pos ); | 1643 | getWindow()->setLanguageTextInput( ime_pos ); |
1649 | } | ||
1650 | } | 1644 | } |
1651 | } | 1645 | } |
1652 | 1646 | ||