Browse Source

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

tags/2021-05-28
jules 11 years ago
parent
commit
0d68add38c
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      modules/juce_gui_basics/components/juce_Desktop.cpp

+ 4
- 3
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! // 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); 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; kioskModeComponent = componentToUse;


Loading…
Cancel
Save