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

Cleaned up some obscure compiler warnings and added some JSON unit tests.

Browse source
This commit is contained in:
Julian Storer 2011-06-12 19:52:58 +01:00
parent 796247483a
commit 2009753eac
41 changed files with 298 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/gui/components/windows/juce_CallOutBox.cpp
View file

@ -36,17 +36,17 @@ BEGIN_JUCE_NAMESPACE
//==============================================================================
CallOutBox::CallOutBox (Component& contentComponent,
Component& componentToPointTo,
Component* const parentComponent)
Component* const parent)
: borderSpace (20), arrowSize (16.0f), content (contentComponent)
{
addAndMakeVisible (&content);
if (parentComponent != nullptr)
if (parent != nullptr)
{
parentComponent->addChildComponent (this);
parent->addChildComponent (this);
updatePosition (parentComponent->getLocalArea (&componentToPointTo, componentToPointTo.getLocalBounds()),
parentComponent->getLocalBounds());
updatePosition (parent->getLocalArea (&componentToPointTo, componentToPointTo.getLocalBounds()),
parent->getLocalBounds());
setVisible (true);
}
@ -155,12 +155,12 @@ void CallOutBox::updatePosition (const Rectangle<int>& newAreaToPointTo, const R
targetArea = newAreaToPointTo;
availableArea = newAreaToFitIn;
Rectangle<int> bounds (0, 0,
content.getWidth() + borderSpace * 2,
content.getHeight() + borderSpace * 2);
Rectangle<int> newBounds (0, 0,
content.getWidth() + borderSpace * 2,
content.getHeight() + borderSpace * 2);
const int hw = bounds.getWidth() / 2;
const int hh = bounds.getHeight() / 2;
const int hw = newBounds.getWidth() / 2;
const int hh = newBounds.getHeight() / 2;
const float hwReduced = (float) (hw - borderSpace * 3);
const float hhReduced = (float) (hh - borderSpace * 3);
const float arrowIndent = borderSpace - arrowSize;
@ -195,12 +195,12 @@ void CallOutBox::updatePosition (const Rectangle<int>& newAreaToPointTo, const R
nearest = distanceFromCentre;
targetPoint = targets[i];
bounds.setPosition ((int) (centre.getX() - hw),
(int) (centre.getY() - hh));
newBounds.setPosition ((int) (centre.getX() - hw),
(int) (centre.getY() - hh));
}
}
setBounds (bounds);
setBounds (newBounds);
}
void CallOutBox::refreshPath()