mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-29 02:40:05 +00:00
Code Activity

Projucer: Fix for toggle button not showing in the "Application Usage Data" window

Browse source
This commit is contained in:
ed 2018-01-22 08:53:10 +00:00
parent 4c44d96fdf
commit 8924eda7b7
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h
View file

@ -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<ToggleButton> shareApplicationUsageDataToggle;
TextButton okButton { "OK" }, upgradeLicenseButton { "Upgrade License" };
void lookAndFeelChanged() override