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: Fix XEmbedComponent::setVisible

Browse source 
This also affects the WebBrowserComponent. Prior to this fix calling
setVisible (false) had no effect.
This commit is contained in:
attila 2025-07-28 19:05:46 +02:00 • committed by Attila Szarvas
parent be8a5f72cc
commit 0c2d55c7dd
1 changed files with 68 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -288,15 +288,76 @@ public:
private:
//==============================================================================
class ComponentIsShowingListener : private ComponentMovementWatcher
{
public:
ComponentIsShowingListener (Component& componentIn, std::function<void()> callbackIn)
: ComponentMovementWatcher (&componentIn),
callback (std::move (callbackIn))
{}
private:
void componentMovedOrResized (bool, bool) override {}
void componentPeerChanged() override {}
void componentVisibilityChanged() override { NullCheckedInvocation::invoke (callback); }
using ComponentMovementWatcher::componentMovedOrResized;
using ComponentMovementWatcher::componentVisibilityChanged;
std::function<void()> callback;
};
class WindowMapper
{
public:
WindowMapper (Pimpl& pimplIn, Window& windowIn)
: pimpl (pimplIn),
window (windowIn)
{}
void update()
{
if (window == 0)
return;
const auto shouldBeMapped = pimpl.getXEmbedMappedFlag()
&& pimpl.owner.isShowing()
&& pimpl.lastPeer != nullptr;
if (std::exchange (mapped, shouldBeMapped) != shouldBeMapped)
{
if (shouldBeMapped)
X11Symbols::getInstance()->xMapWindow (pimpl.getDisplay(), window);
else
X11Symbols::getInstance()->xUnmapWindow (pimpl.getDisplay(), window);
}
}
void unmap()
{
if (window == 0)
return;
X11Symbols::getInstance()->xUnmapWindow (pimpl.getDisplay(), window);
mapped = false;
}
private:
Pimpl& pimpl;
Window& window;
bool mapped = false;
};
XEmbedComponent& owner;
ComponentIsShowingListener isShowingListener { owner, [this] { updateMapping(); } };
Window client = 0, host = 0;
WindowMapper clientMapper { *this, client }, hostMapper { *this, host };
Atom infoAtom, messageTypeAtom;
bool clientInitiated;
bool wantsFocus = false;
bool allowResize = false;
bool supportsXembed = false;
bool hasBeenMapped = false;
int xembedVersion = maxXEmbedVersionToSupport;
ComponentPeer* lastPeer = nullptr;
@ -369,11 +430,8 @@ private:
int defaultScreen = X11Symbols::getInstance()->xDefaultScreen (dpy);
Window root = X11Symbols::getInstance()->xRootWindow (dpy, defaultScreen);
if (hasBeenMapped)
{
X11Symbols::getInstance()->xUnmapWindow (dpy, client);
hasBeenMapped = false;
}
hostMapper.unmap();
clientMapper.unmap();
X11Symbols::getInstance()->xReparentWindow (dpy, client, root, 0, 0);
client = 0;
@ -384,20 +442,8 @@ private:
void updateMapping()
{
if (client != 0)
{
const bool shouldBeMapped = getXEmbedMappedFlag();
if (shouldBeMapped != hasBeenMapped)
{
hasBeenMapped = shouldBeMapped;
if (shouldBeMapped)
X11Symbols::getInstance()->xMapWindow (getDisplay(), client);
else
X11Symbols::getInstance()->xUnmapWindow (getDisplay(), client);
}
}
hostMapper.update();
clientMapper.update();
}
Window getParentX11Window()
@ -496,7 +542,7 @@ private:
Rectangle<int> newBounds = getX11BoundsFromJuce();
if (newPeer == nullptr)
X11Symbols::getInstance()->xUnmapWindow (dpy, host);
hostMapper.unmap();
Window newParent = (newPeer != nullptr ? getParentX11Window() : rootWindow);
X11Symbols::getInstance()->xReparentWindow (dpy, host, newParent, newBounds.getX(), newBounds.getY());
@ -512,7 +558,7 @@ private:
}
componentMovedOrResized (owner, true, true);
X11Symbols::getInstance()->xMapWindow (dpy, host);
updateMapping();
broughtToFront();
}