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

Changes and additions to provide alternatives to modal-loop functionality (Android can't run modal loops). New class ModalCallbackFunction providing quick objects for making callbacks to static functions. Changes to remove modal loops from most of the internal library classes. Added new methods to PopupMenu to provide easier async callbacks, and also a cleaner way of specifying options when showing a menu. Fix for PNG decoding of corrupted image files.

Browse source
This commit is contained in:
Julian Storer 2011-02-11 14:27:28 +00:00
parent d4818c2ac2
commit 2d10b0b43d
47 changed files with 2906 additions and 1606 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/gui/components/juce_ModalComponentManager.cpp
View file

@ -39,14 +39,11 @@ BEGIN_JUCE_NAMESPACE
class ModalComponentManager::ModalItem : public ComponentMovementWatcher
{
public:
ModalItem (Component* const comp, Callback* const callback)
ModalItem (Component* const comp)
: ComponentMovementWatcher (comp),
component (comp), returnValue (0), isActive (true)
{
jassert (comp != 0);
if (callback != 0)
callbacks.add (callback);
}
void componentMovedOrResized (bool, bool) {}
@ -103,10 +100,10 @@ juce_ImplementSingleton_SingleThreaded (ModalComponentManager);
//==============================================================================
void ModalComponentManager::startModal (Component* component, Callback* callback)
void ModalComponentManager::startModal (Component* component)
{
if (component != 0)
stack.add (new ModalItem (component, callback));
stack.add (new ModalItem (component));
}
void ModalComponentManager::attachCallback (Component* component, Callback* callback)
@ -200,17 +197,13 @@ void ModalComponentManager::handleAsyncUpdate()
for (int i = stack.size(); --i >= 0;)
{
const ModalItem* const item = stack.getUnchecked(i);
if (! item->isActive)
{
ScopedPointer<ModalItem> item (stack.removeAndReturn (i));
for (int j = item->callbacks.size(); --j >= 0;)
{
item->callbacks.getUnchecked(j)->modalStateFinished (item->returnValue);
if (! stack.contains (item))
break;
}
stack.removeObject (item);
}
}
}
@ -243,11 +236,11 @@ void ModalComponentManager::bringModalComponentsToFront()
}
}
#if JUCE_MODAL_LOOPS_PERMITTED
class ModalComponentManager::ReturnValueRetriever : public ModalComponentManager::Callback
{
public:
ReturnValueRetriever (int& value_, bool& finished_) : value (value_), finished (finished_) {}
~ReturnValueRetriever() {}
void modalStateFinished (int returnValue)
{
@ -293,6 +286,6 @@ int ModalComponentManager::runEventLoopForCurrentComponent()
return returnValue;
}
#endif
END_JUCE_NAMESPACE