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