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

Couple of minor windowing fixes.

Browse source
This commit is contained in:
jules 2011-12-12 12:55:56 +00:00
parent ba53323cbd
commit c1ab947a53
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/juce_gui_basics/components/juce_Component.cpp
View file

@ -69,7 +69,7 @@ public:
}
}
static void sendMouseEvent (Component& comp, BailOutChecker& checker,
static void sendMouseEvent (Component& comp, Component::BailOutChecker& checker,
void (MouseListener::*eventMethod) (const MouseEvent&), const MouseEvent& e)
{
if (checker.shouldBailOut())
@ -117,7 +117,7 @@ public:
}
}
static void sendWheelEvent (Component& comp, BailOutChecker& checker, const MouseEvent& e,
static void sendWheelEvent (Component& comp, Component::BailOutChecker& checker, const MouseEvent& e,
const float wheelIncrementX, const float wheelIncrementY)
{
{
@ -169,7 +169,7 @@ private:
class BailOutChecker2
{
public:
BailOutChecker2 (BailOutChecker& checker_, Component* const component)
BailOutChecker2 (Component::BailOutChecker& checker_, Component* const component)
: checker (checker_), safePointer (component)
{
}
@ -180,7 +180,7 @@ private:
}
private:
BailOutChecker& checker;
Component::BailOutChecker& checker;
const WeakReference<Component> safePointer;
JUCE_DECLARE_NON_COPYABLE (BailOutChecker2);
@ -693,6 +693,11 @@ void Component::addToDesktop (int styleWanted, void* nativeWindowToAttachTo)
if (wasMinimised)
peer->setMinimised (true);
#if JUCE_WINDOWS
if (isAlwaysOnTop())
peer->setAlwaysOnTop (true);
#endif
peer->setConstrainer (currentConstainer);
repaint();

3
modules/juce_gui_basics/native/juce_win32_Windowing.cpp
View file

@ -1153,9 +1153,6 @@ private:
const float alpha = component->getAlpha();
if (alpha < 1.0f)
setAlpha (alpha);
if (component->isAlwaysOnTop())
setAlwaysOnTop (true);
}
else
{

2
modules/juce_opengl/opengl/juce_OpenGLComponent.cpp
View file

@ -454,7 +454,7 @@ void OpenGLComponent::updateContext()
if (context != nullptr)
{
#if JUCE_LINUX
if (! useThread)
if (! isUsingDedicatedThread())
#endif
updateContextPosition();