livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VWR-21377 Script editor ctrl-f fix. 

change to better / more consistent naming
master
Kelly Washington 2010-09-24 16:31:43 -07:00
parent d129d6ee23
commit 92013d1212
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llfocusmgr.cpp
View File

@ -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;
}

2
indra/llui/llfocusmgr.h
View File

@ -118,7 +118,7 @@ public:
void unlockFocus();
BOOL focusLocked() const { return mLockedView != NULL; }
bool keyboardFocusHasMenus() const;
bool keyboardFocusHasAccelerators() const;
private:
LLUICtrl* mLockedView;

8
indra/llui/llview.h
View File

@ -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

2
indra/newview/llpreviewscript.h
View File

@ -87,7 +87,7 @@ public:
static void onBtnInsertSample(void*);
static void onBtnInsertFunction(LLUICtrl*, void*);
virtual bool hasMenus() const { return true; }
virtual bool hasAccelerators() const { return true; }
private:
void onBtnHelp();

2
indra/newview/llviewerwindow.cpp
View File

@ -2141,7 +2141,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))
{