From f3b01596ddde08a178276fadc44f430928582748 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Fri, 24 Sep 2010 16:31:43 -0700
Subject: [PATCH] VWR-21377 Script editor ctrl-f fix. change to better / more
consistent naming
---
indra/llui/llfocusmgr.cpp | 4 ++--
indra/llui/llfocusmgr.h | 2 +-
indra/llui/llview.h | 8 ++++----
indra/newview/llpreviewscript.h | 2 +-
indra/newview/llviewerwindow.cpp | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 7fbfd80d8da..43e5f6b051d 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -315,12 +315,12 @@ void LLFocusMgr::removeKeyboardFocusWithoutCallback( const LLFocusableElement* f
}
}
-bool LLFocusMgr::keyboardFocusHasMenus() const
+bool LLFocusMgr::keyboardFocusHasAccelerators() const
{
LLView* focus_view = dynamic_cast<LLView*>(mKeyboardFocus);
while( focus_view )
{
- if(focus_view->hasMenus())
+ if(focus_view->hasAccelerators())
{
return true;
}
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h
index e09bad0187d..22c1895075e 100644
--- a/indra/llui/llfocusmgr.h
+++ b/indra/llui/llfocusmgr.h
@@ -118,7 +118,7 @@ class LLFocusMgr
void unlockFocus();
BOOL focusLocked() const { return mLockedView != NULL; }
- bool keyboardFocusHasMenus() const;
+ bool keyboardFocusHasAccelerators() const;
private:
LLUICtrl* mLockedView;
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 706858e65ca..33d345beff5 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -273,10 +273,10 @@ class LLView : public LLMouseHandler, public LLMortician, public LLFocusableElem
BOOL focusNextRoot();
BOOL focusPrevRoot();
- // Normally we want the app menus to get priority on modified keys
- // However, if this item claims to have menus then we want to give
- // it first chance at handling them. (eg. the script editor)
- virtual bool hasMenus() const { return false; };
+ // Normally we want the app menus to get priority on accelerated keys
+ // However, sometimes we want to give specific views a first chance
+ // iat handling them. (eg. the script editor)
+ virtual bool hasAccelerators() const { return false; };
// delete all children. Override this function if you need to
// perform any extra clean up such as cached pointers to selected
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 3207da4e00f..f4b31e5962f 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -87,7 +87,7 @@ class LLScriptEdCore : public LLPanel
static void onBtnInsertSample(void*);
static void onBtnInsertFunction(LLUICtrl*, void*);
- virtual bool hasMenus() const { return true; }
+ virtual bool hasAccelerators() const { return true; }
private:
void onBtnHelp();
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index dbc93176134..983a2d25c81 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2143,7 +2143,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
if (mask & (MASK_CONTROL | MASK_ALT) && !gFocusMgr.focusLocked())
{
// Check the current floater's menu first, if it has one.
- if (gFocusMgr.keyboardFocusHasMenus()
+ if (gFocusMgr.keyboardFocusHasAccelerators()
&& keyboard_focus
&& keyboard_focus->handleKey(key,mask,FALSE))
{
--
GitLab