Remove llqtwebkit, add cef
This commit is contained in:
@@ -46,12 +46,30 @@ BOOL LLFocusableElement::handleKey(KEY key, MASK mask, BOOL called_from_parent)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// virtual
|
||||
BOOL LLFocusableElement::handleKeyUp(KEY key, MASK mask, BOOL called_from_parent)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// virtual
|
||||
BOOL LLFocusableElement::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// virtual
|
||||
bool LLFocusableElement::wantsKeyUpKeyDown() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
//virtual
|
||||
bool LLFocusableElement::wantsReturnKey() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// virtual
|
||||
LLFocusableElement::~LLFocusableElement()
|
||||
{
|
||||
|
||||
@@ -57,8 +57,17 @@ public:
|
||||
|
||||
// These were brought up the hierarchy from LLView so that we don't have to use dynamic_cast when dealing with keyboard focus.
|
||||
virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
|
||||
virtual BOOL handleKeyUp(KEY key, MASK mask, BOOL called_from_parent);
|
||||
virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
|
||||
|
||||
/**
|
||||
* If true this LLFocusableElement wants to receive KEYUP and KEYDOWN messages
|
||||
* even for normal character strokes.
|
||||
* Default implementation returns false.
|
||||
*/
|
||||
virtual bool wantsKeyUpKeyDown() const;
|
||||
virtual bool wantsReturnKey() const;
|
||||
|
||||
virtual void onTopLost(); // called when registered as top ctrl and user clicks elsewhere
|
||||
protected:
|
||||
virtual void onFocusReceived();
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -452,6 +452,7 @@ public:
|
||||
|
||||
// inherited from LLFocusableElement
|
||||
/* virtual */ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
|
||||
/* virtual */ BOOL handleKeyUp(KEY key, MASK mask, BOOL called_from_parent);
|
||||
/* virtual */ BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
|
||||
|
||||
virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
|
||||
@@ -657,6 +658,7 @@ public:
|
||||
virtual void handleReshape(const LLRect& rect, bool by_user);
|
||||
|
||||
virtual BOOL handleKeyHere(KEY key, MASK mask);
|
||||
virtual BOOL handleKeyUpHere(KEY key, MASK mask);
|
||||
virtual BOOL handleUnicodeCharHere(llwchar uni_char);
|
||||
|
||||
|
||||
@@ -681,6 +683,7 @@ protected:
|
||||
void logMouseEvent();
|
||||
|
||||
LLView* childrenHandleKey(KEY key, MASK mask);
|
||||
LLView* childrenHandleKeyUp(KEY key, MASK mask);
|
||||
LLView* childrenHandleUnicodeChar(llwchar uni_char);
|
||||
LLView* childrenHandleDragAndDrop(S32 x, S32 y, MASK mask,
|
||||
BOOL drop,
|
||||
|
||||
Reference in New Issue
Block a user