Move error screen over title

2 files changed, 19 insertions, 20 deletions

diff --git a/source/frontend/StarErrorScreen.cpp b/source/frontend/StarErrorScreen.cpp
index 6d4e6b3..6367d05 100644
--- a/source/frontend/StarErrorScreen.cpp
+++ b/source/frontend/StarErrorScreen.cpp
@@ -12,7 +12,7 @@ namespace Star {
 ErrorScreen::ErrorScreen() {
   m_paneManager = make_shared<PaneManager>();
 
-  m_accepted = false;
+  m_accepted = true;
 
   auto assets = Root::singleton().assets();
 
@@ -39,25 +39,26 @@ bool ErrorScreen::accepted() {
   return m_accepted;
 }
 
-void ErrorScreen::render() {
-  auto assets = Root::singleton().assets();
-
-  for (auto backdropImage : assets->json("/interface/windowconfig/title.config:backdropImages").toArray()) {
-    Vec2F offset = jsonToVec2F(backdropImage.get(0)) * interfaceScale();
-    String image = backdropImage.getString(1);
-    float scale = backdropImage.getFloat(2);
-    Vec2F imageSize = Vec2F(m_guiContext->textureSize(image)) * interfaceScale() * scale;
-
-    Vec2F lowerLeft = Vec2F(windowWidth() / 2.0f, windowHeight());
-    lowerLeft[0] -= imageSize[0] / 2;
-    lowerLeft[1] -= imageSize[1];
-    lowerLeft += offset;
-    RectF screenCoords(lowerLeft, lowerLeft + imageSize);
-    m_guiContext->drawQuad(image, screenCoords);
+void ErrorScreen::render(bool useBackdrop) {
+  if (useBackdrop) {
+    auto assets = Root::singleton().assets();
+
+    for (auto backdropImage : assets->json("/interface/windowconfig/title.config:backdropImages").toArray()) {
+      Vec2F offset = jsonToVec2F(backdropImage.get(0)) * interfaceScale();
+      String image = backdropImage.getString(1);
+      float scale = backdropImage.getFloat(2);
+      Vec2F imageSize = Vec2F(m_guiContext->textureSize(image)) * interfaceScale() * scale;
+
+      Vec2F lowerLeft = Vec2F(windowWidth() / 2.0f, windowHeight());
+      lowerLeft[0] -= imageSize[0] / 2;
+      lowerLeft[1] -= imageSize[1];
+      lowerLeft += offset;
+      RectF screenCoords(lowerLeft, lowerLeft + imageSize);
+      m_guiContext->drawQuad(image, screenCoords);
+    }
   }
 
   m_paneManager->render();
-  renderCursor();
 }
 
 bool ErrorScreen::handleInputEvent(InputEvent const& event) {
diff --git a/source/frontend/StarErrorScreen.hpp b/source/frontend/StarErrorScreen.hpp
index b289678..eb1f73e 100644
--- a/source/frontend/StarErrorScreen.hpp
+++ b/source/frontend/StarErrorScreen.hpp
@@ -23,7 +23,7 @@ public:
 
   bool accepted();
 
-  void render();
+  void render(bool useBackdrop = false);
 
   bool handleInputEvent(InputEvent const& event);
   void update();
@@ -31,8 +31,6 @@ public:
 private:
   void renderCursor();
 
-  void back();
-
   float interfaceScale() const;
   unsigned windowHeight() const;
   unsigned windowWidth() const;