Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature Removal!: Do not scroll to the end of chats when the corresponding chatbar regains focus!

Browse Source 
Focus is given to chatbar on floater focus, so this got in the way.
This feature was never really worth it.
This commit is contained in:
Inusaito Sayori
2014-05-21 22:57:08 -04:00
parent bfbbcad8e5
commit 852a8407c8
6 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llchatbar.cpp
View File

@@ -153,7 +153,6 @@ BOOL LLChatBar::postBuild()
mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2, _3, _4, _5)); mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2, _3, _4, _5));
mInputEditor->setKeystrokeCallback(boost::bind(&LLChatBar::onInputEditorKeystroke,this)); mInputEditor->setKeystrokeCallback(boost::bind(&LLChatBar::onInputEditorKeystroke,this));
mInputEditor->setFocusLostCallback(boost::bind(&LLChatBar::onInputEditorFocusLost)); mInputEditor->setFocusLostCallback(boost::bind(&LLChatBar::onInputEditorFocusLost));
mInputEditor->setFocusReceivedCallback(boost::bind(&LLChatBar::onInputEditorGainFocus));
mInputEditor->setCommitOnFocusLost( FALSE ); mInputEditor->setCommitOnFocusLost( FALSE );
mInputEditor->setRevertOnEsc( FALSE ); mInputEditor->setRevertOnEsc( FALSE );
mInputEditor->setIgnoreTab(TRUE); mInputEditor->setIgnoreTab(TRUE);
@@ -637,12 +636,6 @@ void LLChatBar::onInputEditorFocusLost()
gAgent.stopTyping(); gAgent.stopTyping();
} }
// static
void LLChatBar::onInputEditorGainFocus()
{
LLFloaterChat::setHistoryCursorAndScrollToEnd();
}
// static // static
void LLChatBar::onClickSay( LLUICtrl* ctrl ) void LLChatBar::onClickSay( LLUICtrl* ctrl )
{ {

1
indra/newview/llchatbar.h
View File

@@ -86,7 +86,6 @@ public:
void onInputEditorKeystroke(); void onInputEditorKeystroke();
static void onInputEditorFocusLost(); static void onInputEditorFocusLost();
static void onInputEditorGainFocus();
void onCommitGesture(LLUICtrl* ctrl); void onCommitGesture(LLUICtrl* ctrl);

17
indra/newview/llfloaterchat.cpp
View File

@@ -333,23 +333,6 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
} }
} }
// static
void LLFloaterChat::setHistoryCursorAndScrollToEnd()
{
LLViewerTextEditor* history_editor = LLFloaterChat::getInstance(LLSD())->getChild<LLViewerTextEditor>("Chat History Editor");
LLViewerTextEditor* history_editor_with_mute = LLFloaterChat::getInstance(LLSD())->getChild<LLViewerTextEditor>("Chat History Editor with mute");
if (history_editor)
{
history_editor->setCursorAndScrollToEnd();
}
if (history_editor_with_mute)
{
history_editor_with_mute->setCursorAndScrollToEnd();
}
}
//static //static
void LLFloaterChat::onClickMute(void *data) void LLFloaterChat::onClickMute(void *data)
{ {

2
indra/newview/llfloaterchat.h
View File

@@ -69,8 +69,6 @@ public:
void updateConsoleVisibility(); void updateConsoleVisibility();
void updateSettings(); void updateSettings();
static void setHistoryCursorAndScrollToEnd();
// Add chat to console and history list. // Add chat to console and history list.
// Color based on source, type, distance. // Color based on source, type, distance.
static void addChat(const LLChat& chat, BOOL from_im = FALSE, BOOL local_agent = FALSE); static void addChat(const LLChat& chat, BOOL from_im = FALSE, BOOL local_agent = FALSE);

6
indra/newview/llimpanel.cpp
View File

@@ -468,7 +468,6 @@ BOOL LLFloaterIMPanel::postBuild()
mInputEditor = getChild<LLLineEditor>("chat_editor"); mInputEditor = getChild<LLLineEditor>("chat_editor");
mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2, _3, _4, _5)); mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2, _3, _4, _5));
mInputEditor->setFocusReceivedCallback( boost::bind(&LLFloaterIMPanel::onInputEditorFocusReceived, this) );
mFocusLostSignal = mInputEditor->setFocusLostCallback(boost::bind(&LLFloaterIMPanel::setTyping, this, false)); mFocusLostSignal = mInputEditor->setFocusLostCallback(boost::bind(&LLFloaterIMPanel::setTyping, this, false));
mInputEditor->setKeystrokeCallback( boost::bind(&LLFloaterIMPanel::onInputEditorKeystroke, this, _1) ); mInputEditor->setKeystrokeCallback( boost::bind(&LLFloaterIMPanel::onInputEditorKeystroke, this, _1) );
mInputEditor->setCommitCallback( boost::bind(&LLFloaterIMPanel::onSendMsg,this) ); mInputEditor->setCommitCallback( boost::bind(&LLFloaterIMPanel::onSendMsg,this) );
@@ -1028,11 +1027,6 @@ void LLFloaterIMPanel::onClickToggleActiveSpeakers(const LLSD& value)
childSetVisible("active_speakers_panel", !value); childSetVisible("active_speakers_panel", !value);
} }
void LLFloaterIMPanel::onInputEditorFocusReceived()
{
mHistoryEditor->setCursorAndScrollToEnd();
}
void LLFloaterIMPanel::onInputEditorKeystroke(LLLineEditor* caller) void LLFloaterIMPanel::onInputEditorKeystroke(LLLineEditor* caller)
{ {
// Deleting all text counts as stopping typing. // Deleting all text counts as stopping typing.

1
indra/newview/llimpanel.h
View File

@@ -97,7 +97,6 @@ public:
BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE ); BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
void onFocusReceived(); void onFocusReceived();
void onInputEditorFocusReceived();
void onInputEditorKeystroke(LLLineEditor* caller); void onInputEditorKeystroke(LLLineEditor* caller);
void onClickHistory(); void onClickHistory();