From 97eed1e8897997650bbcecbec275ca1e65b8b8d4 Mon Sep 17 00:00:00 2001 From: tpoole Date: Tue, 9 May 2017 09:45:44 +0100 Subject: [PATCH] Added a static getSplashScreenLogo() method to JUCESplashScreen --- .../misc/juce_JUCESplashScreen.cpp | 79 ++++++++++--------- .../misc/juce_JUCESplashScreen.h | 2 + 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/modules/juce_gui_basics/misc/juce_JUCESplashScreen.cpp b/modules/juce_gui_basics/misc/juce_JUCESplashScreen.cpp index e63d8bf090..b0b4ee9be2 100644 --- a/modules/juce_gui_basics/misc/juce_JUCESplashScreen.cpp +++ b/modules/juce_gui_basics/misc/juce_JUCESplashScreen.cpp @@ -233,43 +233,7 @@ JUCESplashScreen::JUCESplashScreen (Component& parent) if (splashDisplayTime == 0 || Time::getMillisecondCounter() < splashDisplayTime + (uint32) millisecondsToDisplaySplash) { - const char* svgData = R"JUCESPLASHSCREEN( - - - - - - - - - - " - R"JUCESPLASHSCREEN( - - - - - - - - - - - - - - - - )JUCESPLASHSCREEN"; - - ScopedPointer svgXml (XmlDocument::parse (svgData)); - content = Drawable::createFromSVG (*svgXml); + content = getSplashScreenLogo(); setAlwaysOnTop (true); parent.addAndMakeVisible (this); @@ -285,6 +249,47 @@ JUCESplashScreen::~JUCESplashScreen() { } +Drawable* JUCESplashScreen::getSplashScreenLogo() +{ + const char* svgData = R"JUCESPLASHSCREEN( + + + + + + + + + + " + R"JUCESPLASHSCREEN( + + + + + + + + + + + + + + + + )JUCESPLASHSCREEN"; + + ScopedPointer svgXml (XmlDocument::parse (svgData)); + return Drawable::createFromSVG (*svgXml); +} + void JUCESplashScreen::paint (Graphics& g) { auto r = getLocalBounds().toFloat(); diff --git a/modules/juce_gui_basics/misc/juce_JUCESplashScreen.h b/modules/juce_gui_basics/misc/juce_JUCESplashScreen.h index 3e86a9e508..fc733568be 100644 --- a/modules/juce_gui_basics/misc/juce_JUCESplashScreen.h +++ b/modules/juce_gui_basics/misc/juce_JUCESplashScreen.h @@ -51,6 +51,8 @@ public: JUCESplashScreen (Component& parentToAddTo); ~JUCESplashScreen(); + static Drawable* getSplashScreenLogo(); + private: void paint (Graphics&) override; void timerCallback() override;