summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorKelly Washington <kelly@lindenlab.com>2010-09-24 16:31:43 -0700
committerKelly Washington <kelly@lindenlab.com>2010-09-24 16:31:43 -0700
commit92013d1212fdd2f082f1fdf07350e8e319b2fd75 (patch)
treed68f2e0a4fc863a96105fa2ce78f8ada3e084344 /indra/llui
parentd129d6ee23995d0a5e89aa71e56d6ed6aa95761e (diff)
VWR-21377 Script editor ctrl-f fix.
change to better / more consistent naming
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llfocusmgr.cpp4
-rw-r--r--indra/llui/llfocusmgr.h2
-rw-r--r--indra/llui/llview.h8
3 files changed, 7 insertions, 7 deletions
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 7fbfd80d8d..43e5f6b051 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 e09bad0187..22c1895075 100644
--- a/indra/llui/llfocusmgr.h
+++ b/indra/llui/llfocusmgr.h
@@ -118,7 +118,7 @@ public:
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 62683491ef..6d79415c26 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -277,10 +277,10 @@ public:
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