From 8924eda7b7962fb8b8928462ee34b7f82dcfa692 Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 22 Jan 2018 08:53:10 +0000 Subject: [PATCH] Projucer: Fix for toggle button not showing in the "Application Usage Data" window --- .../jucer_ApplicationUsageDataWindowComponent.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h b/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h index 8ce432a89d..8a9e77a791 100644 --- a/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h +++ b/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h @@ -64,14 +64,14 @@ public: if (showCheckbox) { - addAndMakeVisible (shareApplicationUsageDataToggle); + addAndMakeVisible (shareApplicationUsageDataToggle = new ToggleButton()); auto* controller = ProjucerApplication::getApp().licenseController.get(); if (controller != nullptr && controller->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::disabled) - shareApplicationUsageDataToggle.setToggleState (false, dontSendNotification); + shareApplicationUsageDataToggle->setToggleState (false, dontSendNotification); else - shareApplicationUsageDataToggle.setToggleState (true, dontSendNotification); + shareApplicationUsageDataToggle->setToggleState (true, dontSendNotification); addAndMakeVisible (shareApplicationUsageDataLabel); shareApplicationUsageDataLabel.setFont (Font (14.0f)); @@ -96,7 +96,7 @@ public: { auto newApplicationUsageDataState = LicenseState::ApplicationUsageData::enabled; - if (shareApplicationUsageDataToggle.isShowing() && ! shareApplicationUsageDataToggle.getToggleState()) + if (shareApplicationUsageDataToggle != nullptr && ! shareApplicationUsageDataToggle->getToggleState()) newApplicationUsageDataState = LicenseState::ApplicationUsageData::disabled; controller->setApplicationUsageDataState (newApplicationUsageDataState); @@ -115,12 +115,12 @@ public: juceEULALink.setBounds (linkBounds.removeFromLeft (linkBounds.getWidth() / 2).reduced (2)); privacyPolicyLink.setBounds (linkBounds.reduced (2)); - if (shareApplicationUsageDataToggle.isShowing()) + if (shareApplicationUsageDataToggle != nullptr) { bounds.removeFromTop (10); auto toggleBounds = bounds.removeFromTop (40); - shareApplicationUsageDataToggle.setBounds (toggleBounds.removeFromLeft (40).reduced (5)); + shareApplicationUsageDataToggle->setBounds (toggleBounds.removeFromLeft (40).reduced (5)); shareApplicationUsageDataLabel.setBounds (toggleBounds); } @@ -151,7 +151,7 @@ private: Label headerLabel, bodyLabel; HyperlinkButton juceEULALink, privacyPolicyLink; Label shareApplicationUsageDataLabel { {}, "Help JUCE to improve its software and services by sharing my application usage data" }; - ToggleButton shareApplicationUsageDataToggle; + ScopedPointer shareApplicationUsageDataToggle; TextButton okButton { "OK" }, upgradeLicenseButton { "Upgrade License" }; void lookAndFeelChanged() override