Remove llqtwebkit, add cef
This commit is contained in:
@@ -963,6 +963,38 @@ BOOL LLView::handleKey(KEY key, MASK mask, BOOL called_from_parent)
|
||||
return handled;
|
||||
}
|
||||
|
||||
BOOL LLView::handleKeyUp(KEY key, MASK mask, BOOL called_from_parent)
|
||||
{
|
||||
BOOL handled = FALSE;
|
||||
|
||||
if (getVisible() && getEnabled())
|
||||
{
|
||||
if (called_from_parent)
|
||||
{
|
||||
// Downward traversal
|
||||
handled = childrenHandleKeyUp(key, mask) != NULL;
|
||||
}
|
||||
|
||||
if (!handled)
|
||||
{
|
||||
// For event logging we don't care which widget handles it
|
||||
// So we capture the key at the end of this function once we know if it was handled
|
||||
handled = handleKeyUpHere(key, mask);
|
||||
if (handled)
|
||||
{
|
||||
LL_DEBUGS() << "Key handled by " << getName() << LL_ENDL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!handled && !called_from_parent && mParentView)
|
||||
{
|
||||
// Upward traversal
|
||||
handled = mParentView->handleKeyUp(key, mask, FALSE);
|
||||
}
|
||||
return handled;
|
||||
}
|
||||
|
||||
// Called from handleKey()
|
||||
// Handles key in this object. Checking parents and children happens in handleKey()
|
||||
BOOL LLView::handleKeyHere(KEY key, MASK mask)
|
||||
@@ -970,6 +1002,13 @@ BOOL LLView::handleKeyHere(KEY key, MASK mask)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// Called from handleKey()
|
||||
// Handles key in this object. Checking parents and children happens in handleKey()
|
||||
BOOL LLView::handleKeyUpHere(KEY key, MASK mask)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL LLView::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
|
||||
{
|
||||
BOOL handled = FALSE;
|
||||
@@ -1095,6 +1134,12 @@ LLView* LLView::childrenHandleKey(KEY key, MASK mask)
|
||||
return childrenHandleCharEvent("Key", &LLView::handleKey, key, mask);
|
||||
}
|
||||
|
||||
// Called during downward traversal
|
||||
LLView* LLView::childrenHandleKeyUp(KEY key, MASK mask)
|
||||
{
|
||||
return childrenHandleCharEvent("Key Up", &LLView::handleKeyUp, key, mask);
|
||||
}
|
||||
|
||||
// Called during downward traversal
|
||||
LLView* LLView::childrenHandleUnicodeChar(llwchar uni_char)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user