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

XEmbedComponent: Improve formatting

Browse source
This commit is contained in:
reuk 2025-12-16 12:27:56 +00:00
parent f48ca1b1e3
commit ea5cffcbd2
No known key found for this signature in database
1 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -372,34 +372,34 @@ private:
void componentParentHierarchyChanged (Component&) override { peerChanged (owner.getPeer()); }
void componentMovedOrResized (Component&, bool, bool) override
{
if (host != 0 && lastPeer != nullptr)
if (host == 0 || lastPeer == nullptr)
return;
auto dpy = getDisplay();
auto newBounds = getX11BoundsFromJuce();
XWindowAttributes attr;
if (X11Symbols::getInstance()->xGetWindowAttributes (dpy, host, &attr))
{
auto dpy = getDisplay();
auto newBounds = getX11BoundsFromJuce();
XWindowAttributes attr;
if (X11Symbols::getInstance()->xGetWindowAttributes (dpy, host, &attr))
Rectangle currentBounds (attr.x, attr.y, attr.width, attr.height);
if (currentBounds != newBounds)
{
Rectangle<int> currentBounds (attr.x, attr.y, attr.width, attr.height);
if (currentBounds != newBounds)
{
X11Symbols::getInstance()->xMoveResizeWindow (dpy, host, newBounds.getX(), newBounds.getY(),
static_cast<unsigned int> (newBounds.getWidth()),
static_cast<unsigned int> (newBounds.getHeight()));
}
X11Symbols::getInstance()->xMoveResizeWindow (dpy, host, newBounds.getX(), newBounds.getY(),
static_cast<unsigned int> (newBounds.getWidth()),
static_cast<unsigned int> (newBounds.getHeight()));
}
}
if (client != 0 && X11Symbols::getInstance()->xGetWindowAttributes (dpy, client, &attr))
if (client != 0 && X11Symbols::getInstance()->xGetWindowAttributes (dpy, client, &attr))
{
Rectangle currentBounds (attr.x, attr.y, attr.width, attr.height);
if (std::tuple (currentBounds.getWidth(), currentBounds.getHeight())
!= std::tuple (newBounds.getWidth(), newBounds.getHeight()))
{
Rectangle<int> currentBounds (attr.x, attr.y, attr.width, attr.height);
if ((currentBounds.getWidth() != newBounds.getWidth()
|| currentBounds.getHeight() != newBounds.getHeight()))
{
X11Symbols::getInstance()->xMoveResizeWindow (dpy, client, 0, 0,
static_cast<unsigned int> (newBounds.getWidth()),
static_cast<unsigned int> (newBounds.getHeight()));
}
X11Symbols::getInstance()->xMoveResizeWindow (dpy, client, 0, 0,
static_cast<unsigned int> (newBounds.getWidth()),
static_cast<unsigned int> (newBounds.getHeight()));
}
}
}
@ -517,13 +517,13 @@ private:
const double scale = (peer != nullptr ? peer->getPlatformScaleFactor()
: displays.getPrimaryDisplay()->scale);
Point<int> topLeftInPeer
= (peer != nullptr ? peer->getComponent().getLocalPoint (&owner, Point<int> (0, 0))
const auto topLeftInPeer
= (peer != nullptr ? peer->getComponent().getLocalPoint (&owner, Point (0, 0))
: owner.getBounds().getTopLeft());
Rectangle<int> newBounds (topLeftInPeer.getX(), topLeftInPeer.getY(),
static_cast<int> (static_cast<double> (attr.width) / scale),
static_cast<int> (static_cast<double> (attr.height) / scale));
Rectangle newBounds (topLeftInPeer.getX(), topLeftInPeer.getY(),
static_cast<int> (static_cast<double> (attr.width) / scale),
static_cast<int> (static_cast<double> (attr.height) / scale));
if (peer != nullptr)
@ -545,7 +545,7 @@ private:
auto dpy = getDisplay();
Window rootWindow = X11Symbols::getInstance()->xRootWindow (dpy, DefaultScreen (dpy));
Rectangle<int> newBounds = getX11BoundsFromJuce();
const auto newBounds = getX11BoundsFromJuce();
if (newPeer == nullptr)
hostMapper.unmap();
@ -619,7 +619,7 @@ private:
if (allowResize)
configureNotify();
else
MessageManager::callAsync ([this] {componentMovedOrResized (owner, true, true);});
MessageManager::callAsync ([this] { componentMovedOrResized (owner, true, true); });
return true;