diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:31:19 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:31:19 -0700 |
| commit | a1f49564d670a2c41bfa25c833bba2564b9b7f48 (patch) | |
| tree | 1d205e51bc37621916a17d459ad83782fe41f975 /indra/newview/llfloatergotoline.cpp | |
| parent | 6af5db09faf5ea33a2d4c47b64e76f42edae178a (diff) | |
| parent | 6377610f6587989c126b00f490dfc8d527a1c2ce (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/newview/llfloatergotoline.cpp')
| -rw-r--r-- | indra/newview/llfloatergotoline.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/indra/newview/llfloatergotoline.cpp b/indra/newview/llfloatergotoline.cpp index b297d251d1..09ca0ab530 100644 --- a/indra/newview/llfloatergotoline.cpp +++ b/indra/newview/llfloatergotoline.cpp @@ -43,7 +43,7 @@ LLFloaterGotoLine::LLFloaterGotoLine(LLScriptEdCore* editor_core) buildFromFile("floater_goto_line.xml"); sInstance = this; - + // find floater in which script panel is embedded LLView* viewp = (LLView*)editor_core; while(viewp) @@ -60,9 +60,9 @@ LLFloaterGotoLine::LLFloaterGotoLine(LLScriptEdCore* editor_core) bool LLFloaterGotoLine::postBuild() { - mGotoBox = getChild<LLLineEditor>("goto_line"); - mGotoBox->setCommitCallback(boost::bind(&LLFloaterGotoLine::onGotoBoxCommit, this)); - mGotoBox->setCommitOnFocusLost(false); + mGotoBox = getChild<LLLineEditor>("goto_line"); + mGotoBox->setCommitCallback(boost::bind(&LLFloaterGotoLine::onGotoBoxCommit, this)); + mGotoBox->setCommitOnFocusLost(false); getChild<LLLineEditor>("goto_line")->setPrevalidate(LLTextValidate::validateNonNegativeS32); childSetAction("goto_btn", onBtnGoto,this); setDefaultBtn("goto_btn"); @@ -70,7 +70,7 @@ bool LLFloaterGotoLine::postBuild() return true; } -//static +//static void LLFloaterGotoLine::show(LLScriptEdCore* editor_core) { if (sInstance && sInstance->mEditorCore && sInstance->mEditorCore != editor_core) @@ -93,7 +93,7 @@ LLFloaterGotoLine::~LLFloaterGotoLine() sInstance = NULL; } -// static +// static void LLFloaterGotoLine::onBtnGoto(void *userdata) { LLFloaterGotoLine* self = (LLFloaterGotoLine*)userdata; @@ -109,9 +109,9 @@ void LLFloaterGotoLine::handleBtnGoto() { if (mEditorCore && mEditorCore->mEditor) { - mEditorCore->mEditor->deselect(); - mEditorCore->mEditor->setCursor(row, column); - mEditorCore->mEditor->setFocus(true); + mEditorCore->mEditor->deselect(); + mEditorCore->mEditor->setCursor(row, column); + mEditorCore->mEditor->setFocus(true); } } } @@ -144,17 +144,17 @@ void LLFloaterGotoLine::onGotoBoxCommit() { if (mEditorCore && mEditorCore->mEditor) { - mEditorCore->mEditor->setCursor(row, column); - - S32 rownew = 0; - S32 columnnew = 0; - mEditorCore->mEditor->getCurrentLineAndColumn( &rownew, &columnnew, false ); // don't include wordwrap - if (rownew == row && columnnew == column) - { - mEditorCore->mEditor->deselect(); - mEditorCore->mEditor->setFocus(true); - sInstance->closeFloater(); - } //else do nothing (if the cursor-position didn't change) + mEditorCore->mEditor->setCursor(row, column); + + S32 rownew = 0; + S32 columnnew = 0; + mEditorCore->mEditor->getCurrentLineAndColumn( &rownew, &columnnew, false ); // don't include wordwrap + if (rownew == row && columnnew == column) + { + mEditorCore->mEditor->deselect(); + mEditorCore->mEditor->setFocus(true); + sInstance->closeFloater(); + } //else do nothing (if the cursor-position didn't change) } } } |