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

Minor clean-ups.

Browse source
This commit is contained in:
jules 2012-10-28 20:33:17 +00:00
parent f13621a78d
commit 8ae91bb39a
14 changed files with 96 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp
View file

@ -67,10 +67,8 @@ public:
bool useTimeslice (const int elapsed)
{
Component* const c = proxy != nullptr ? static_cast <Component*> (proxy)
: static_cast <Component*> (component);
if (c != nullptr)
if (Component* const c = proxy != nullptr ? static_cast <Component*> (proxy)
: static_cast <Component*> (component))
{
msElapsed += elapsed;
double newProgress = msElapsed / (double) msTotal;
@ -146,9 +144,7 @@ public:
setAlpha (c.getAlpha());
setInterceptsMouseClicks (false, false);
Component* const parent = c.getParentComponent();
if (parent != nullptr)
if (Component* const parent = c.getParentComponent())
parent->addAndMakeVisible (this);
else if (c.isOnDesktop() && c.getPeer() != nullptr)
addToDesktop (c.getPeer()->getStyleFlags() | ComponentPeer::windowIgnoresKeyPresses);
@ -282,9 +278,7 @@ void ComponentAnimator::cancelAllAnimations (const bool moveComponentsToTheirFin
void ComponentAnimator::cancelAnimation (Component* const component,
const bool moveComponentToItsFinalPosition)
{
AnimationTask* const at = findTaskFor (component);
if (at != nullptr)
if (AnimationTask* const at = findTaskFor (component))
{
if (moveComponentToItsFinalPosition)
at->moveToFinalDestination();
@ -297,9 +291,8 @@ void ComponentAnimator::cancelAnimation (Component* const component,
Rectangle<int> ComponentAnimator::getComponentDestination (Component* const component)
{
jassert (component != nullptr);
AnimationTask* const at = findTaskFor (component);
if (at != nullptr)
if (AnimationTask* const at = findTaskFor (component))
return at->destination;
return component->getBounds();