mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Added a parameter to the OnlineUnlockForm constructor to specify whether its OverlayComp should have a cancel button

Browse source
This commit is contained in:
ed 2017-11-06 10:16:48 +00:00
parent e1dff09916
commit c7be3ed55a
2 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/juce_product_unlocking/marketplace/juce_OnlineUnlockForm.cpp
View file

@ -40,15 +40,23 @@ struct Spinner : public Component, private Timer
struct OnlineUnlockForm::OverlayComp : public Component,
private Thread,
private Timer
private Timer,
private Button::Listener
{
OverlayComp (OnlineUnlockForm& f) : Thread (String()), form (f)
OverlayComp (OnlineUnlockForm& f, bool hasCancelButton = false)
: Thread (String()), form (f)
{
result.succeeded = false;
email = form.emailBox.getText();
password = form.passwordBox.getText();
addAndMakeVisible (spinner);
if (hasCancelButton)
{
addAndMakeVisible (cancelButton = new TextButton (TRANS ("Cancel")));
cancelButton->addListener (this);
}
startThread (4);
}
@ -73,6 +81,9 @@ struct OnlineUnlockForm::OverlayComp : public Component,
{
const int spinnerSize = 40;
spinner.setBounds ((getWidth() - spinnerSize) / 2, proportionOfHeight (0.6f), spinnerSize, spinnerSize);
if (cancelButton != nullptr)
cancelButton->setBounds (getLocalBounds().removeFromBottom (50).reduced (getWidth() / 4, 5));
}
void run() override
@ -114,11 +125,24 @@ struct OnlineUnlockForm::OverlayComp : public Component,
f.dismiss();
}
void buttonClicked (Button* button) override
{
if (button == cancelButton)
{
spinner.setVisible (false);
stopTimer();
delete this;
}
}
OnlineUnlockForm& form;
Spinner spinner;
OnlineUnlockStatus::UnlockResult result;
String email, password;
ScopedPointer<TextButton> cancelButton;
JUCE_LEAK_DETECTOR (OnlineUnlockForm::OverlayComp)
};
@ -133,12 +157,14 @@ static juce_wchar getDefaultPasswordChar() noexcept
OnlineUnlockForm::OnlineUnlockForm (OnlineUnlockStatus& s,
const String& userInstructions,
bool hasCancelButton)
bool hasCancelButton,
bool overlayHasCancelButton)
: message (String(), userInstructions),
passwordBox (String(), getDefaultPasswordChar()),
registerButton (TRANS("Register")),
cancelButton (TRANS ("Cancel")),
status (s)
status (s),
showOverlayCancelButton (overlayHasCancelButton)
{
// Please supply a message to tell your users what to do!
jassert (userInstructions.isNotEmpty());
@ -276,7 +302,7 @@ void OnlineUnlockForm::attemptRegistration()
status.setUserEmail (emailBox.getText());
addAndMakeVisible (unlockingOverlay = new OverlayComp (*this));
addAndMakeVisible (unlockingOverlay = new OverlayComp (*this, showOverlayCancelButton));
resized();
unlockingOverlay->enterModalState();
}

5
modules/juce_product_unlocking/marketplace/juce_OnlineUnlockForm.h
View file

@ -55,7 +55,8 @@ public:
*/
OnlineUnlockForm (OnlineUnlockStatus&,
const String& userInstructions,
bool hasCancelButton = true);
bool hasCancelButton = true,
bool overlayHasCancelButton = false);
/** Destructor. */
~OnlineUnlockForm();
@ -81,6 +82,8 @@ private:
OnlineUnlockStatus& status;
ScopedPointer<BubbleMessageComponent> bubble;
bool showOverlayCancelButton;
struct OverlayComp;
friend struct OverlayComp;
Component::SafePointer<Component> unlockingOverlay;