Commits

Kelly Washington committed 598ca53

VWR-21377 Script editor ctrl-f fix.
change to better / more consistent naming

  • Participants
  • Parent commits a4ff3d2

Comments (0)

Files changed (5)

indra/llui/llfocusmgr.cpp

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

indra/llui/llfocusmgr.h

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

indra/llui/llview.h

 	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

indra/newview/llpreviewscript.h

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

indra/newview/llviewerwindow.cpp

 	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))
 		{