From d3ba59ffde7f3d62ab365e3e4754e633889237a6 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 16 Dec 2017 14:20:11 -0500 Subject: [PATCH] UI: Open Solo logo and version splash screen --- .../images/logo_startup/Solo_Logo.png | Bin 56181 -> 16811 bytes artoo/src/ui_splash.cpp | 14 +------------- artoo/src/ui_splash.h | 1 - 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/artoo/resources/images/logo_startup/Solo_Logo.png b/artoo/resources/images/logo_startup/Solo_Logo.png index 45438ece3b406a9ed264acbe804e6362b2238e3d..272b2bff1d8207d45052fb468977b15d03a51693 100644 GIT binary patch delta 1468 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 BMGXJ| diff --git a/artoo/src/ui_splash.cpp b/artoo/src/ui_splash.cpp index e7f474c..7aa3a81 100644 --- a/artoo/src/ui_splash.cpp +++ b/artoo/src/ui_splash.cpp @@ -39,10 +39,7 @@ bool UiSplash::update() } } - if (versionDrawRequested) { - drawVersion(); - versionDrawRequested = false; - } + drawVersion(); uint16_t w = scale(millis, 0U, BootEstimateMillis, 0U, Gfx::WIDTH); Gfx::fillRect(Gfx::Rect(0, Gfx::HEIGHT - ProgressBarH, w, ProgressBarH), UiColor::Green); @@ -50,15 +47,6 @@ bool UiSplash::update() return false; } -void UiSplash::onAButtonEvent(Button *b, Button::Event e) -{ - UNUSED(b); - - if (e == Button::ClickRelease) { - versionDrawRequested = true; - } -} - void UiSplash::drawVersion() { const Gfx::FontAsset & f = HelveticaNeueLTProRoman; diff --git a/artoo/src/ui_splash.h b/artoo/src/ui_splash.h index f152f26..f32fed8 100644 --- a/artoo/src/ui_splash.h +++ b/artoo/src/ui_splash.h @@ -10,7 +10,6 @@ public: void init(); bool update(); - void onAButtonEvent(Button *b, Button::Event e); private: static const unsigned MinSplashMillis = 6000;