diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-21 02:10:12 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-21 02:10:12 +0000 |
| commit | 78aec043f35b8b07dc0f2ba39baba737dd57555e (patch) | |
| tree | 1645378aaa34b02ffb6b4f864a4a83828f19c8ab /indra/llui | |
| parent | 11d85dac83e9d58f8f6e441dcea2d1f2b661c58d (diff) | |
svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/llmenugl.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/llview.cpp | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 0a63ebbe74..420970a38a 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1637,6 +1637,9 @@ void LLLineEditor::draw() S32 pixels_after_scroll = findPixelNearestPos(); // RCalculcate for IME position LLRect screen_pos = getScreenRect(); LLCoordGL ime_pos( screen_pos.mLeft + pixels_after_scroll, screen_pos.mTop - UI_LINEEDITOR_V_PAD ); + + ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]); + ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]); getWindow()->setLanguageTextInput( ime_pos ); } } diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 8ec5656e18..d150f8954e 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -1421,6 +1421,7 @@ void LLMenuItemBranchGL::onVisibilityChange( BOOL new_visibility ) { mBranch->setVisible(FALSE); } + LLMenuItemGL::onVisibilityChange(new_visibility); } BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent ) diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index af1813a429..fa1181a866 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2816,6 +2816,9 @@ void LLTextEditor::drawCursor() // Make sure the IME is in the right place LLRect screen_pos = getScreenRect(); LLCoordGL ime_pos( screen_pos.mLeft + llfloor(cursor_left), screen_pos.mBottom + llfloor(cursor_top) ); + + ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]); + ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]); getWindow()->setLanguageTextInput( ime_pos ); } } diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 4d3bdaed98..a047f9912e 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -797,6 +797,7 @@ BOOL LLView::setLabelArg(const LLString& key, const LLStringExplicit& text) return FALSE; } +// virtual void LLView::onVisibilityChange ( BOOL new_visibility ) { for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it) |