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

Made sure that isKioskMode returns false for components while they're being taken out of kiosk mode.

Browse source
This commit is contained in:
jules 2014-04-01 12:49:04 +01:00
parent b5d10d753a
commit 0d68add38c
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/juce_gui_basics/components/juce_Desktop.cpp
View file

@ -351,10 +351,11 @@ void Desktop::setKioskModeComponent (Component* componentToUse, const bool allow
// agh! Don't delete or remove a component from the desktop while it's still the kiosk component!
jassert (kioskModeComponent == nullptr || ComponentPeer::getPeerFor (kioskModeComponent) != nullptr);
if (kioskModeComponent != nullptr)
if (Component* const oldKioskComp = kioskModeComponent)
{
setKioskComponent (kioskModeComponent, false, allowMenusAndBars);
kioskModeComponent->setBounds (kioskComponentOriginalBounds);
kioskModeComponent = nullptr; // (to make sure that isKioskMode() returns false when resizing the old one)
setKioskComponent (oldKioskComp, false, allowMenusAndBars);
oldKioskComp->setBounds (kioskComponentOriginalBounds);
}
kioskModeComponent = componentToUse;