mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Fix bug in LabelKeyboardFocusTraverser causing editable labels to consume focus traversal events

Browse source
This commit is contained in:
ed 2021-10-21 16:19:02 +01:00
parent de375ab6d7
commit 6218e2f92b
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/juce_gui_basics/widgets/juce_Label.cpp
View file

@ -409,16 +409,8 @@ public:
Component* getDefaultComponent (Component* parent) override
{
auto getContainer = [&]
{
if (owner.getCurrentTextEditor() != nullptr && parent == &owner)
return owner.findKeyboardFocusContainer();
return parent;
};
if (auto* container = getContainer())
KeyboardFocusTraverser::getDefaultComponent (container);
if (auto* container = getKeyboardFocusContainer (parent))
return KeyboardFocusTraverser::getDefaultComponent (container);
return nullptr;
}
@ -426,6 +418,14 @@ public:
Component* getNextComponent (Component* c) override { return KeyboardFocusTraverser::getNextComponent (getComp (c)); }
Component* getPreviousComponent (Component* c) override { return KeyboardFocusTraverser::getPreviousComponent (getComp (c)); }
std::vector<Component*> getAllComponents (Component* parent) override
{
if (auto* container = getKeyboardFocusContainer (parent))
return KeyboardFocusTraverser::getAllComponents (container);
return {};
}
private:
Component* getComp (Component* current) const
{
@ -436,6 +436,14 @@ private:
return current;
}
Component* getKeyboardFocusContainer (Component* parent) const
{
if (owner.getCurrentTextEditor() != nullptr && parent == &owner)
return owner.findKeyboardFocusContainer();
return parent;
}
Label& owner;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LabelKeyboardFocusTraverser)