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

Linux: XEmbedComponent: Improve focus transfer handling

Browse source
This commit is contained in:
attila 2024-01-11 20:06:22 +01:00 • committed by Anthony Nicholls
parent c320a42c36
commit 624fed2c7f
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_gui_extra/embedding/juce_XEmbedComponent.h
View file

@ -112,7 +112,7 @@ protected:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics&) override; void paint (Graphics&) override;
void focusGained (FocusChangeType) override; void focusGainedWithDirection (FocusChangeType, FocusChangeDirection) override;
void focusLost (FocusChangeType) override; void focusLost (FocusChangeType) override;
void broughtToFront() override; void broughtToFront() override;

25
modules/juce_gui_extra/native/juce_XEmbedComponent_linux.cpp
View file

@ -234,13 +234,25 @@ public:
} }
} }
void focusGained (FocusChangeType changeType) void focusGained (FocusChangeType changeType, FocusChangeDirection direction)
{ {
if (client != 0 && supportsXembed && wantsFocus) if (client != 0 && supportsXembed && wantsFocus)
{ {
updateKeyFocus(); updateKeyFocus();
const auto xembedDirection = [&]
{
if (direction == FocusChangeDirection::forward)
return XEMBED_FOCUS_FIRST;
if (direction == FocusChangeDirection::backward)
return XEMBED_FOCUS_LAST;
return XEMBED_FOCUS_CURRENT;
}();
sendXEmbedEvent (CurrentTime, XEMBED_FOCUS_IN, sendXEmbedEvent (CurrentTime, XEMBED_FOCUS_IN,
(changeType == focusChangedByTabKey ? XEMBED_FOCUS_FIRST : XEMBED_FOCUS_CURRENT)); (changeType == focusChangedByTabKey ? xembedDirection : XEMBED_FOCUS_CURRENT));
} }
} }
@ -516,6 +528,9 @@ private:
//============================================================================== //==============================================================================
void handleXembedCmd (const ::Time& /*xTime*/, long opcode, long /*detail*/, long /*data1*/, long /*data2*/) void handleXembedCmd (const ::Time& /*xTime*/, long opcode, long /*detail*/, long /*data1*/, long /*data2*/)
{ {
if (auto* peer = owner.getPeer())
peer->getCurrentModifiersRealtime();
switch (opcode) switch (opcode)
{ {
case XEMBED_REQUEST_FOCUS: case XEMBED_REQUEST_FOCUS:
@ -699,7 +714,11 @@ void XEmbedComponent::paint (Graphics& g)
g.fillAll (Colours::lightgrey); g.fillAll (Colours::lightgrey);
} }
void XEmbedComponent::focusGained (FocusChangeType changeType) { pimpl->focusGained (changeType); } void XEmbedComponent::focusGainedWithDirection (FocusChangeType changeType, FocusChangeDirection direction)
{
pimpl->focusGained (changeType, direction);
}
void XEmbedComponent::focusLost (FocusChangeType changeType) { pimpl->focusLost (changeType); } void XEmbedComponent::focusLost (FocusChangeType changeType) { pimpl->focusLost (changeType); }
void XEmbedComponent::broughtToFront() { pimpl->broughtToFront(); } void XEmbedComponent::broughtToFront() { pimpl->broughtToFront(); }
unsigned long XEmbedComponent::getHostWindowID() { return pimpl->getHostWindowID(); } unsigned long XEmbedComponent::getHostWindowID() { return pimpl->getHostWindowID(); }