Backdrop, fix crash-on-exit(!)

libstarlight/source/starlight/Application.cpp

@@ -82,8 +82,15 @@ void Application::_init() {
 void Application::_end() {
     End();
     
+    //for (auto& f : forms) f->Close();
     forms.clear(); // not sure why, but not doing this results in a data abort if any forms are active
     
+    // force cleanup! let's not softlock, mmkay?
+    formTouchScreen = nullptr;
+    formTopScreen = nullptr;
+    touchScreen.reset();
+    topScreen.reset();
+    
     ThemeManager::End();
     RenderCore::Close();
     ConfigManager::End();

libstarlight/source/starlight/dialog/Backdrop.cpp

@@ -0,0 +1,17 @@
+#include "Backdrop.h"
+
+#include "starlight/ui/Image.h"
+
+using starlight::ui::Image;
+
+using starlight::ui::Form;
+
+using starlight::dialog::Backdrop;
+
+Backdrop::Backdrop(std::string imgPath) : Form(true) {
+    priority = -1000000; // it is, after all, a backdrop
+    auto img = std::make_shared<Image>(VRect(0, 0, 400, 480), imgPath);
+    topScreen->Add(img);
+    touchScreen->Add(img);
+    touchScreen->scrollOffset = Vector2(40, 240);
+}

libstarlight/source/starlight/dialog/Backdrop.h

@@ -0,0 +1,21 @@
+#pragma once
+#include "starlight/_global.h"
+
+#include <string>
+
+#include "starlight/ThemeManager.h"
+
+#include "starlight/ui/Form.h"
+
+namespace starlight {
+    namespace dialog {
+        class Backdrop : public ui::Form, public ui::FormCreator<Backdrop> {
+        private:
+            //
+        
+        public:
+            Backdrop(std::string imgPath = "decorations/generic backdrop");
+            //~Backdrop() override { };
+        };
+    }
+}

libstarlight/source/starlight/dialog/OSK.cpp

@@ -121,6 +121,7 @@ OSK::OSK(osk::InputHandler* handler) : Form(true), handler(handler) {
 void OSK::Update(bool focused) {
     if (handler->done) {
         Close();
+        return;
     }
     if (focused) {
         if (InputManager::Pressed(Keys::B)) handler->Done();

libstarlight/source/starlight/dialog/OSK.h

@@ -25,7 +25,7 @@ namespace starlight {
             std::unique_ptr<osk::InputHandler> handler;
             
             OSK(osk::InputHandler* handler);
-            ~OSK() override { };
+            //~OSK() override { };
             
             void Update(bool focused) override;
             

libstarlight/source/starlight/ui/Form.cpp

@@ -62,6 +62,7 @@ void Form::Open(bool showImmediately) {
 }
 
 void Form::Close() {
+    volatile auto keepalive = shared_from_this(); // don't allow delete until Close() goes out of scope
     auto app = Application::Current();
     if (app == nullptr) return;
     app->forms.remove(shared_from_this());

libstarlight/source/starlight/ui/Form.h

@@ -66,7 +66,7 @@ namespace starlight {
             
             Form() { }
             Form(bool useDefaults);
-            virtual ~Form() { }
+            virtual ~Form() = default;
             
             void Open(bool showImmediately = true);
             void Close();

libstarlight/source/starlight/ui/UICanvas.h

@@ -19,7 +19,7 @@ namespace starlight {
             bool needsRedraw = true;
             
             UICanvas(VRect rect);
-            ~UICanvas() { }
+            //~UICanvas() { }
             
             void MarkForRedraw() override;
             

libstarlight/source/starlight/ui/UIContainer.cpp

@@ -10,7 +10,6 @@ using starlight::ui::UIElement;
 using starlight::ui::UIContainer;
 
 UIContainer::UIContainer() { }
-UIContainer::~UIContainer() { }
 
 void UIContainer::Dive(std::function<bool(UIElement*)> check, std::function<bool(UIElement*)> func, bool consumable, bool frontFirst) {
     bool finished = false;

libstarlight/source/starlight/ui/UIContainer.h

@@ -29,7 +29,7 @@ namespace starlight {
             
             UIContainer();
             UIContainer(VRect rect) { this->rect = rect; }
-            ~UIContainer();
+            //~UIContainer();
             
             void Dive(std::function<bool(UIElement*)> check, std::function<bool(UIElement*)> func, bool consumable = true, bool frontFirst = true);
             void Dive(std::function<bool(UIElement*)> func, bool consumable = true, bool frontFirst = true);

libstarlight/source/starlight/ui/UIElement.cpp

@@ -6,7 +6,7 @@ using starlight::ui::UIElement;
 using starlight::ui::UIContainer;
 
 UIElement::UIElement() { }
-UIElement::~UIElement() { }
+//UIElement::~UIElement() { }
 
 void UIElement::_Dive(std::function<bool(UIElement*)>& check, std::function<bool(UIElement*)>& func, bool consumable, bool frontFirst, bool& finished) {
     if (!check(this)) return;
@@ -43,4 +43,4 @@ VRect& UIElement::Resize(Vector2 size) {
 
 void UIElement::MarkForRedraw() {
     if (auto p = parent.lock()) p->MarkForRedraw();
-}
+}

libstarlight/source/starlight/ui/UIElement.h

@@ -32,7 +32,7 @@ namespace starlight {
             inline VRect& Resize(float w, float h) { return Resize(Vector2(w, h)); }
             
             UIElement();
-            virtual ~UIElement();
+            virtual ~UIElement() = default;
             
             virtual void Update() { }
             virtual void PreDraw() { }

libstarlight/todo.txt

@@ -3,16 +3,13 @@
 
 roadmap to first release, in no particular order {
     finish implementing OSK! {
-        - fix cursor-down
         polish! {
-            - background
             actual cursor image?
         }
         InputManager::OpenKeyboard
     }
-    fix [ offset (-1 it)
     
-    add generic backdrop assets (and form)
+    - whee, fixed softlock/crash on exit, hopefully permanently!
     
     add license!! (MIT?)
     ADD README.MD PLS

testbed/source/Core.cpp

@@ -18,6 +18,7 @@
 #include "starlight/ui/TextBox.h"
 #include "starlight/ui/Label.h"
 
+#include "starlight/dialog/Backdrop.h"
 #include "starlight/dialog/MessageBox.h"
 #include "starlight/dialog/OSK.h"
 
@@ -81,6 +82,8 @@ void Core::Init() {
         tb->multiLine = true;
         form->touchScreen->Add(tb);
         
+        sl::dialog::Backdrop::New()->Open();
+        
         /*label->SetFont("default.16");
         btn.SetText("I was pressed!");
         btn.eOnTap = [label](auto& btn){