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

Reverted #6d356423 as it broke centring for child components

Browse source
This commit is contained in:
ed 2017-03-06 11:45:15 +00:00
parent 607b09ab7b
commit 0fa188ab5b
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -434,9 +434,9 @@ struct Component::ComponentHelpers
static Rectangle<int> getParentOrMainMonitorBounds (const Component& comp)
{
if (Component* p = comp.getParentComponent())
return comp.getLocalArea (p, p->getLocalBounds());
return p->getLocalBounds();
return convertFromParentSpace (comp, Desktop::getInstance().getDisplays().getMainDisplay().userArea);
return Desktop::getInstance().getDisplays().getMainDisplay().userArea;
}
static void releaseAllCachedImageResources (Component& c)
@ -1250,10 +1250,8 @@ void Component::setBounds (const String& newBoundsExpression)
void Component::setBoundsRelative (const float x, const float y,
const float w, const float h)
{
const Rectangle<int> parentArea (ComponentHelpers::getParentOrMainMonitorBounds (*this));
const int pw = parentArea.getWidth();
const int ph = parentArea.getHeight();
const int pw = getParentWidth();
const int ph = getParentHeight();
setBounds (roundToInt (x * pw),
roundToInt (y * ph),
@ -1263,8 +1261,8 @@ void Component::setBoundsRelative (const float x, const float y,
void Component::setCentrePosition (const int x, const int y)
{
setTopLeftPosition (ComponentHelpers::convertFromParentSpace (*this, Point<int> (x, y))
.translated (getWidth() / -2, getHeight() / -2));
setTopLeftPosition (x - getWidth() / 2,
y - getHeight() / 2);
}
void Component::setCentreRelative (const float x, const float y)