fix by downgrading libtesla...

HookedBehemoth · HookedBehemoth · commit 045d0fd75a68 · 2020-03-28T21:03:00.000+01:00
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -12,7 +12,8 @@
             "defines": [
                 "SWITCH",
                 "__SWITCH__",
-                "DEBUG"
+                "DEBUG",
+                "VERSION=\"1.3.3.7\""
             ],
             "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-g++",
             "cStandard": "c11",
diff --git a/libs/include/tesla.hpp b/libs/include/tesla.hpp
@@ -120,15 +120,8 @@ namespace tsl {
     };
 
     class Overlay;
-    namespace elm { class Element; }
 
     namespace impl { 
-
-        extern std::vector<tsl::elm::Element*> g_deletedElements;
-
-        static inline void reportDeletedElement(tsl::elm::Element *element) {
-            tsl::impl::g_deletedElements.push_back(element);
-        } 
         
         /**
          * @brief Overlay launch parameters
@@ -1075,9 +1068,7 @@ namespace tsl {
         class Element {
         public:
             Element() {}
-            virtual ~Element() {
-                tsl::impl::reportDeletedElement(this);
-            }
+            virtual ~Element() {}
 
             /**
              * @brief Handles focus requesting
@@ -1642,25 +1633,6 @@ namespace tsl {
             }
 
             virtual void draw(gfx::Renderer *renderer) override {
-                if (this->m_clearList) {
-                    for (auto& item : this->m_items)
-                        delete item;
-
-                    this->m_items.clear();
-                    this->m_offset = 0;
-                    this->m_focusedIndex = 0;
-                    this->invalidate();
-                    this->m_clearList = false;
-                }
-
-                for (auto &element : this->m_itemsToAdd) {
-                    element->invalidate();
-                    this->m_items.push_back(element);
-                    this->invalidate();
-                    this->updateScrollOffset();
-                }
-                this->m_itemsToAdd.clear();
-
                 renderer->enableScissoring(this->getX(), this->getY(), this->getWidth(), this->getHeight());
 
                 for (auto &entry : this->m_items) {
@@ -1693,7 +1665,7 @@ namespace tsl {
             }
 
             /**
-             * @brief Adds a new item to the list before the next frame starts
+             * @brief Adds a new item to the list
              * 
              * @param element Element to add
              * @param height Height of the element. Don't set this parameter for libtesla to try and figure out the size based on the type 
@@ -1705,26 +1677,30 @@ namespace tsl {
 
                     element->setParent(this);
                     element->invalidate();
-
-                    this->m_itemsToAdd.push_back(element);
+                    this->m_items.push_back(element);
+                    this->invalidate();
                 }
 
-            }
+                if (this->m_items.size() == 1)
+                    this->requestFocus(nullptr, FocusDirection::None);
+            }   
 
             /**
-             * @brief Removes all children from the list later on
+             * @brief Removes all children from the list
              * @warning When clearing a list, make sure none of the its children are focused. Call \ref Gui::removeFocus before.
              */
             virtual void clear() final {     
-                this->m_clearList = true;
+                for (auto& item : this->m_items)
+                    delete item;
+
+                this->m_items.clear();
+                this->m_offset = 0;
+                this->m_focusedIndex = 0;
             }
 
             virtual Element* requestFocus(Element *oldFocus, FocusDirection direction) override {
                 Element *newFocus = nullptr;
 
-                if (this->m_clearList || this->m_itemsToAdd.size() > 0)
-                    return nullptr;
-
                 if (direction == FocusDirection::None) {
                     for (u16 i = 0; i < this->m_items.size(); i++) {
                         newFocus = this->m_items[i]->requestFocus(oldFocus, direction);
@@ -1799,13 +1775,10 @@ namespace tsl {
             u32 m_listHeight = 0;
             u16 m_entriesShown = 5;
 
-            bool m_clearList = false;
-            std::vector<Element *> m_itemsToAdd;
-
         private:
 
             virtual void updateScrollOffset() {
-                this->m_nextOffset = 0;
+                /*this->m_nextOffset = 0;
                 for (u16 i = 0; i < this->m_focusedIndex; i++)
                     this->m_nextOffset += this->m_items[i]->getHeight();
 
@@ -1815,7 +1788,7 @@ namespace tsl {
                     this->m_nextOffset = 0;
 
                 if (this->m_nextOffset > (this->m_listHeight - this->getHeight()) + 50)
-                    this->m_nextOffset = (this->m_listHeight - this->getHeight() + 50);
+                    this->m_nextOffset = (this->m_listHeight - this->getHeight() + 50);*/
             }
         };
 
@@ -1893,9 +1866,8 @@ namespace tsl {
             }
 
             virtual bool onClick(u64 keys) {
-                if (keys & KEY_A) {
+                if (keys & KEY_A)
                     this->triggerClickAnimation();
-                }
 
                 return Element::onClick(keys);
             }
@@ -2396,9 +2368,6 @@ namespace tsl {
          * @param renderer 
          */
         virtual void draw(gfx::Renderer *renderer) final {
-            if (this->getFocusedElement() == nullptr && this->getTopElement() != nullptr)
-                this->requestFocus(this->getTopElement(), tsl::FocusDirection::None);
-
             if (this->m_topElement != nullptr)
                 this->m_topElement->draw(renderer);
         }
@@ -2624,8 +2593,6 @@ namespace tsl {
 
             renderer.startFrame();
 
-            for (auto &deletedElement : tsl::impl::g_deletedElements)
-                this->getCurrentGui()->removeFocus(deletedElement);
 
             this->animationLoop();
             this->getCurrentGui()->update();
@@ -2655,19 +2622,16 @@ namespace tsl {
 
                     return;
                 }
-                else {
-                    currentFocus = topElement->requestFocus(nullptr, tsl::FocusDirection::None);
-                }
+                else
+                    currentFocus = topElement;
             }
 
-
             bool handled = false;
             elm::Element *parentElement = currentFocus;
-
-            while (!handled && parentElement != nullptr) {
+            do {
                 handled = parentElement->onClick(keysDown);
                 parentElement = parentElement->getParent();
-            }
+            } while (!handled && parentElement != nullptr);
 
             parentElement = currentFocus;
             do {
@@ -3122,10 +3086,7 @@ namespace tsl::cfg {
     u16 FramebufferWidth  = 0;
     u16 FramebufferHeight = 0;
     u64 launchCombo = KEY_L | KEY_DDOWN | KEY_RSTICK;
-}
 
-namespace tsl::impl {
-    std::vector<tsl::elm::Element*> g_deletedElements;
 }
 
 extern "C" {
diff --git a/source/gui_error.cpp b/source/gui_error.cpp
@@ -28,20 +28,22 @@ ErrorGui::ErrorGui(Result rc) {
 }
 
 tsl::elm::Element *ErrorGui::createUI() {
-    auto rootFrame = new tsl::elm::OverlayFrame("ovl-tune \u266B", VERSION);
+    auto rootFrame = new tsl::elm::OverlayFrame("ShareNX \uE134", VERSION);
 
     auto *custom = new tsl::elm::CustomDrawer([&](tsl::gfx::Renderer *drawer, u16 x, u16 y, u16 w, u16 h) {
-        drawer->drawString("\uE150", false, (w - 90) / 2, 300, 90, 0xffff);
-        drawer->drawString(this->m_msg, false, 55, 380, 25, 0xffff);
-        if (this->m_result)
+        static s32 msg_width = 0;
+        if (msg_width == 0) {
+            auto [width ,height] = drawer->drawString(this->m_msg, false, 0, 0, 25, tsl::style::color::ColorTransparent);
+            msg_width = width;
+        }
+        drawer->drawString("\uE150", false, x + ((w - 90) / 2), 300, 90, 0xffff);
+        drawer->drawString(this->m_msg, false, x + ((w - msg_width) / 2), 380, 25, 0xffff);
+        if (this->m_result) {
             drawer->drawString(this->m_result, false, 120, 430, 25, 0xffff);
+        }
     });
 
     rootFrame->setContent(custom);
 
     return rootFrame;
 }
-
-bool ErrorGui::handleInput(u64, u64, touchPosition, JoystickPosition, JoystickPosition) {
-    return false;
-}
diff --git a/source/gui_error.hpp b/source/gui_error.hpp
@@ -29,5 +29,4 @@ class ErrorGui : public tsl::Gui {
     ErrorGui(Result rc);
 
     virtual tsl::elm::Element *createUI() override;
-    virtual bool handleInput(u64, u64, touchPosition, JoystickPosition, JoystickPosition) override;
 };
diff --git a/source/gui_main.cpp b/source/gui_main.cpp
@@ -20,50 +20,36 @@
 #include <string>
 
 #include "gui_error.hpp"
-#include "image_item.hpp"
 #include "upload.hpp"
 
 MainGui::MainGui(const CapsAlbumFileId &file_id, const u8 *rgba_buffer)
-    : fileId(file_id), buffer(rgba_buffer) {}
+    : fileId(file_id) {
+    img = new ImageItem(file_id, rgba_buffer);
+}
 
 MainGui::~MainGui() {}
 
 tsl::elm::Element *MainGui::createUI() {
-    auto rootFrame = new tsl::elm::OverlayFrame("ShareNX", "v1.0.1");
-
-    std::snprintf(this->appId, 0x11, "%016lX", this->fileId.application_id);
-
-    std::snprintf(this->date, 0x20, "%4d:%02d:%02d %02d:%02d:%02d",
-                  this->fileId.datetime.year,
-                  this->fileId.datetime.month,
-                  this->fileId.datetime.day,
-                  this->fileId.datetime.hour,
-                  this->fileId.datetime.minute,
-                  this->fileId.datetime.second);
+    auto rootFrame = new tsl::elm::OverlayFrame("ShareNX \uE134", VERSION);
 
     auto *list = new tsl::elm::List(2);
 
-    list->addItem(new ImageItem(this->buffer));
+    list->addItem(this->img);
 
     auto *button = new tsl::elm::ListItem("Upload");
     button->setClickListener([&](u64 keys) {
         if (keys && KEY_A && !this->uploaded) {
             this->url = web::UploadImage(this->fileId);
             this->uploaded = true;
-            list->addItemPostponed(new tsl::elm::ListItem(url));
+            list->addItem(new tsl::elm::ListItem(url));
             return true;
         }
         return false;
     });
     list->addItem(button);
-    list->addItem(new tsl::elm::ListItem(this->appId));
-    list->addItem(new tsl::elm::ListItem(this->date));
 
     rootFrame->setContent(list);
 
     return rootFrame;
 }
 
-bool MainGui::handleInput(u64, u64, touchPosition, JoystickPosition, JoystickPosition) {
-    return false;
-}
diff --git a/source/gui_main.hpp b/source/gui_main.hpp
@@ -18,22 +18,20 @@
 #pragma once
 #include <tesla.hpp>
 
+#include "image_item.hpp"
+
 class MainGui : public tsl::Gui {
   private:
-    char appId[0x11];
-    char date[0x20];
+    ImageItem *img;
     std::string url;
     bool uploaded = false;
     CapsAlbumFileId fileId;
-    const u8 *buffer;
 
   public:
-    MainGui(const CapsAlbumFileId& fileId, const u8 *rgba_buffer);
+    MainGui(const CapsAlbumFileId &fileId, const u8 *rgba_buffer);
     ~MainGui();
 
     virtual tsl::elm::Element *createUI() override;
 
     virtual void update() override {}
-
-    virtual bool handleInput(u64 down, u64 held, touchPosition pos, JoystickPosition left, JoystickPosition right) override;
 };
diff --git a/source/image_item.hpp b/source/image_item.hpp
@@ -8,27 +8,50 @@ constexpr size_t IMG_SIZE = THUMB_WIDTH * THUMB_HEIGHT * 4;
 
 class ImageItem : public tsl::elm::ListItem {
   private:
+    CapsAlbumFileId fileId;
     const u8 *buffer;
     s32 img_x, img_y;
+    char appId[0x11];
+    char date[0x20];
+    std::string url;
 
   public:
-    ImageItem(const u8 *image)
-        : ListItem(""), buffer(image), img_x(), img_y() {}
+    ImageItem(const CapsAlbumFileId &file_id, const u8 *image)
+        : ListItem(""), fileId(file_id), buffer(image), img_x(), img_y(), url() {
+
+        std::snprintf(this->appId, 0x11, "%016lX", this->fileId.application_id);
+
+        std::snprintf(this->date, 0x20, "%4d:%02d:%02d %02d:%02d:%02d",
+                      this->fileId.datetime.year,
+                      this->fileId.datetime.month,
+                      this->fileId.datetime.day,
+                      this->fileId.datetime.hour,
+                      this->fileId.datetime.minute,
+                      this->fileId.datetime.second);
+    }
 
     virtual void draw(tsl::gfx::Renderer *renderer) override {
-        if (this->img_x == 0 || this->img_y == 0) {
-            this->img_x = this->getX() + ((this->getWidth() - THUMB_WIDTH) / 2);
-            this->img_y = this->getY() + ((this->getHeight() - THUMB_HEIGHT) / 2);
-        }
-        renderer->drawRect(this->img_x, this->img_y, THUMB_WIDTH, THUMB_HEIGHT, 0xf000);
-        renderer->drawBitmap(this->img_x, this->img_y, THUMB_WIDTH, THUMB_HEIGHT, this->buffer);
+        u32 img_x = this->getX() + ((this->getWidth() - THUMB_WIDTH) / 2);
+        renderer->drawRect(img_x, this->getY(), THUMB_WIDTH, THUMB_HEIGHT, 0xf000);
+        renderer->drawBitmap(img_x, this->getY(), THUMB_WIDTH, THUMB_HEIGHT, this->buffer);
+
+        renderer->drawString(this->appId, false, this->getX() + 15, this->getY() + THUMB_HEIGHT + 25, 20, tsl::style::color::ColorText);
+        renderer->drawString(this->date, false, this->getX() + 15, this->getY() + THUMB_HEIGHT + 55, 20, tsl::style::color::ColorText);
+
+        if (!url.empty())
+            renderer->drawString(this->url.c_str(), false, this->getX() + 15, this->getY() + THUMB_HEIGHT + 85, 20, tsl::style::color::ColorText);
     }
 
     virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
-        this->setBoundaries(this->getX(), this->getY(), this->getWidth(), THUMB_HEIGHT + 150);
+        this->setBoundaries(this->getX(), this->getY(), this->getWidth(), THUMB_HEIGHT + 100);
     }
 
     virtual tsl::elm::Element *requestFocus(tsl::elm::Element *, tsl::FocusDirection) {
         return nullptr;
     }
+
+  public:
+    void setUrl(const std::string& url) {
+        this->url = url;
+    }
 };
