Browse Source

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

v6.1.6
ed 4 years ago
parent
commit
6218e2f92b
1 changed files with 18 additions and 10 deletions
  1. +18
    -10
      modules/juce_gui_basics/widgets/juce_Label.cpp

+ 18
- 10
modules/juce_gui_basics/widgets/juce_Label.cpp View File

@@ -409,16 +409,8 @@ public:
Component* getDefaultComponent (Component* parent) override 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; return nullptr;
} }
@@ -426,6 +418,14 @@ public:
Component* getNextComponent (Component* c) override { return KeyboardFocusTraverser::getNextComponent (getComp (c)); } Component* getNextComponent (Component* c) override { return KeyboardFocusTraverser::getNextComponent (getComp (c)); }
Component* getPreviousComponent (Component* c) override { return KeyboardFocusTraverser::getPreviousComponent (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: private:
Component* getComp (Component* current) const Component* getComp (Component* current) const
{ {
@@ -436,6 +436,14 @@ private:
return current; return current;
} }
Component* getKeyboardFocusContainer (Component* parent) const
{
if (owner.getCurrentTextEditor() != nullptr && parent == &owner)
return owner.findKeyboardFocusContainer();
return parent;
}
Label& owner; Label& owner;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LabelKeyboardFocusTraverser) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LabelKeyboardFocusTraverser)


Loading…
Cancel
Save