mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-05 03:50:07 +00:00
Code Activity

Added a bit of extra functionality to WindowsRegistry. Linux: couple of fixes for fullscreen, file chooser, and a bit of tidying up. Internal refactoring in NSViewComponent.

Browse source
This commit is contained in:
jules 2012-03-18 16:41:03 +00:00
parent b888a72db9
commit 49870de020
7 changed files with 157 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

108
modules/juce_gui_basics/native/juce_linux_Windowing.cpp
View file

@ -744,7 +744,6 @@ public:
LinuxComponentPeer (Component* const component, const int windowStyleFlags, Window parentToAddTo)
: ComponentPeer (component, windowStyleFlags),
windowH (0), parentWindow (0),
wx (0), wy (0), ww (0), wh (0),
fullScreen (false), mapped (false),
visual (0), depth (0)
{
@ -814,26 +813,49 @@ public:
void setBounds (int x, int y, int w, int h, bool isNowFullScreen)
{
if (fullScreen && ! isNowFullScreen)
{
// When transitioning back from fullscreen, we might need to remove
// the FULLSCREEN window property
Atom fs = Atoms::getIfExists ("_NET_WM_STATE_FULLSCREEN");
if (fs != None)
{
Window root = RootWindow (display, DefaultScreen (display));
XClientMessageEvent clientMsg;
clientMsg.display = display;
clientMsg.window = windowH;
clientMsg.type = ClientMessage;
clientMsg.format = 32;
clientMsg.message_type = Atoms::WindowState;
clientMsg.data.l[0] = 0; // Remove
clientMsg.data.l[1] = fs;
clientMsg.data.l[2] = 0;
clientMsg.data.l[3] = 1; // Normal Source
ScopedXLock xlock;
XSendEvent (display, root, false,
SubstructureRedirectMask | SubstructureNotifyMask,
(XEvent*) &clientMsg);
}
}
fullScreen = isNowFullScreen;
if (windowH != 0)
{
bounds.setBounds (x, y, jmax (1, w), jmax (1, h));
WeakReference<Component> deletionChecker (component);
wx = x;
wy = y;
ww = jmax (1, w);
wh = jmax (1, h);
ScopedXLock xlock;
// Make sure the Window manager does what we want
XSizeHints* hints = XAllocSizeHints();
hints->flags = USSize | USPosition;
hints->width = ww;
hints->height = wh;
hints->x = wx;
hints->y = wy;
XSizeHints* const hints = XAllocSizeHints();
hints->flags = USSize | USPosition;
hints->x = bounds.getX();
hints->y = bounds.getY();
hints->width = bounds.getWidth();
hints->height = bounds.getHeight();
if ((getStyleFlags() & (windowHasTitleBar | windowIsResizable)) == windowHasTitleBar)
{
@ -846,10 +868,12 @@ public:
XFree (hints);
XMoveResizeWindow (display, windowH,
wx - windowBorder.getLeft(),
wy - windowBorder.getTop(), ww, wh);
bounds.getX() - windowBorder.getLeft(),
bounds.getY() - windowBorder.getTop(),
bounds.getWidth(),
bounds.getHeight());
if (deletionChecker != 0)
if (deletionChecker != nullptr)
{
updateBorderSize();
handleMovedOrResized();
@ -857,10 +881,10 @@ public:
}
}
void setPosition (int x, int y) { setBounds (x, y, ww, wh, false); }
void setSize (int w, int h) { setBounds (wx, wy, w, h, false); }
Rectangle<int> getBounds() const { return Rectangle<int> (wx, wy, ww, wh); }
Point<int> getScreenPosition() const { return Point<int> (wx, wy); }
void setPosition (int x, int y) { setBounds (x, y, bounds.getWidth(), bounds.getHeight(), false); }
void setSize (int w, int h) { setBounds (bounds.getX(), bounds.getY(), w, h, false); }
Rectangle<int> getBounds() const { return bounds; }
Point<int> getScreenPosition() const { return bounds.getPosition(); }
Point<int> localToGlobal (const Point<int>& relativePosition)
{
@ -998,7 +1022,7 @@ public:
bool contains (const Point<int>& position, bool trueIfInAChildWindow) const
{
if (! (isPositiveAndBelow (position.getX(), ww) && isPositiveAndBelow (position.getY(), wh)))
if (! bounds.withZeroOrigin().contains (position))
return false;
for (int i = Desktop::getInstance().getNumComponents(); --i >= 0;)
@ -1008,7 +1032,7 @@ public:
if (c == getComponent())
break;
if (c->contains (position + Point<int> (wx, wy) - c->getScreenPosition()))
if (c->contains (position + bounds.getPosition() - c->getScreenPosition()))
return false;
}
@ -1016,21 +1040,14 @@ public:
return true;
::Window root, child;
unsigned int bw, depth;
int wx, wy, w, h;
int wx, wy;
unsigned int ww, wh, bw, depth;
ScopedXLock xlock;
if (! XGetGeometry (display, (::Drawable) windowH, &root,
&wx, &wy, (unsigned int*) &w, (unsigned int*) &h,
&bw, &depth))
{
return false;
}
if (! XTranslateCoordinates (display, windowH, windowH, position.getX(), position.getY(), &wx, &wy, &child))
return false;
return child == None;
return XGetGeometry (display, (::Drawable) windowH, &root, &wx, &wy, &ww, &wh, &bw, &depth)
&& XTranslateCoordinates (display, windowH, windowH, position.getX(), position.getY(), &wx, &wy, &child)
&& child == None;
}
BorderSize<int> getFrameSize() const
@ -1821,7 +1838,7 @@ private:
friend class LinuxRepaintManager;
Window windowH, parentWindow;
int wx, wy, ww, wh;
Rectangle<int> bounds;
Image taskbarImage;
bool fullScreen, mapped;
Visual* visual;
@ -2230,19 +2247,16 @@ private:
if (windowH != 0)
{
Window root, child;
unsigned int bw, depth;
int wx = 0, wy = 0;
unsigned int ww = 0, wh = 0, bw, depth;
ScopedXLock xlock;
if (! XGetGeometry (display, (::Drawable) windowH, &root,
&wx, &wy, (unsigned int*) &ww, (unsigned int*) &wh,
&bw, &depth))
{
wx = wy = ww = wh = 0;
}
else if (! XTranslateCoordinates (display, windowH, root, 0, 0, &wx, &wy, &child))
{
wx = wy = 0;
}
if (XGetGeometry (display, (::Drawable) windowH, &root, &wx, &wy, &ww, &wh, &bw, &depth))
if (! XTranslateCoordinates (display, windowH, root, 0, 0, &wx, &wy, &child))
wx = wy = 0;
bounds.setBounds (wx, wy, ww, wh);
}
}