From 7f270188082e5c49b42f3b11bf8ebf0c54ed8a76 Mon Sep 17 00:00:00 2001
From: zetaPRIME <qmanxt@gmail.com>
Date: Sat, 18 Mar 2017 19:29:32 -0400
Subject: [PATCH] UIContainer::AddNew, Add uses std::move, Optional type,
 button styles and glyphs, lower memory footprint for default text style on
 Label

---
 .../source/starlight/datatypes/Optional.h     |  63 ++++++++++++++++++
 libstarlight/source/starlight/dialog/OSK.cpp  |   6 +-
 .../source/starlight/gfx/DrawableImage.cpp    |   2 +-
 libstarlight/source/starlight/ui/Button.cpp   |  15 +++--
 libstarlight/source/starlight/ui/Button.h     |  17 ++++-
 libstarlight/source/starlight/ui/Label.cpp    |  17 +++--
 libstarlight/source/starlight/ui/Label.h      |   6 +-
 .../source/starlight/ui/UIContainer.cpp       |   4 +-
 .../source/starlight/ui/UIContainer.h         |   5 ++
 libstarlight/todo.txt                         |  25 +++++--
 testbed/source/Core.cpp                       |  14 ++--
 themes/default/glyphs/backspace.large.png     | Bin 0 -> 309 bytes
 themes/default/glyphs/backspace.small.png     | Bin 0 -> 295 bytes
 themes/default/glyphs/backspace.xcf           | Bin 0 -> 3906 bytes
 themes/default/glyphs/enter.large.png         | Bin 0 -> 267 bytes
 themes/default/glyphs/enter.small.png         | Bin 0 -> 237 bytes
 themes/default/glyphs/enter.xcf               | Bin 0 -> 3046 bytes
 17 files changed, 146 insertions(+), 28 deletions(-)
 create mode 100644 libstarlight/source/starlight/datatypes/Optional.h
 create mode 100644 themes/default/glyphs/backspace.large.png
 create mode 100644 themes/default/glyphs/backspace.small.png
 create mode 100644 themes/default/glyphs/backspace.xcf
 create mode 100644 themes/default/glyphs/enter.large.png
 create mode 100644 themes/default/glyphs/enter.small.png
 create mode 100644 themes/default/glyphs/enter.xcf

diff --git a/libstarlight/source/starlight/datatypes/Optional.h b/libstarlight/source/starlight/datatypes/Optional.h
new file mode 100644
index 0000000..00c921c
--- /dev/null
+++ b/libstarlight/source/starlight/datatypes/Optional.h
@@ -0,0 +1,63 @@
+#pragma once
+#include "starlight/_global.h"
+
+#include <memory>
+
+namespace starlight {
+    template<typename T>
+    class Optional {
+    private:
+        std::unique_ptr<T> p = nullptr;
+        std::function<T&()>* getdef = nullptr;
+        
+        inline void initp() {
+            if (!p) {
+                p = std::make_unique<T>();
+                if (getdef) *p = (*getdef)();
+            }
+        }
+        
+    public:
+        Optional<T>() = default;
+        Optional<T>(std::function<T&()>* getDefault) : getdef(getDefault) { }
+        Optional<T>(nullptr_t) : p(nullptr) { }
+        Optional<T>(const Optional<T>& o) { // copy operator *actually copies the inner object*
+            if (o.p) {
+                p = std::make_unique<T>();
+                *p = *o.p;
+            }
+            getdef = o.getdef;
+        }
+        
+        Optional<T>& operator=(const nullptr_t&) { p.reset(); }
+        Optional<T>& operator=(const T& o) { // assign by type's assignment operator if passed a "value"
+            if (!p) p = std::make_unique<T>();
+            *p = o;
+            return *this;
+        }
+        
+        T& operator *() {
+            initp();
+            return *p;
+        }
+        
+        T* operator ->() {
+            initp();
+            return &*p;
+        }
+        
+        inline T& Get(T& defaultRef) {
+            if (p) return *p;
+            return defaultRef;
+        }
+        
+        inline T& ROGet() {
+            if (p) return *p;
+            if (getdef) return (*getdef)();
+            static T fb; return fb; // meh, hackish but you shouldn't do this without a getdef anyway
+            // todo: clean this up somehow ^ (throw instead? or maybe have a static unique_ptr instead so we save memory when this is never called for a type)
+        }
+        
+        //
+    };
+}
diff --git a/libstarlight/source/starlight/dialog/OSK.cpp b/libstarlight/source/starlight/dialog/OSK.cpp
index bf1ccdf..e8234fa 100644
--- a/libstarlight/source/starlight/dialog/OSK.cpp
+++ b/libstarlight/source/starlight/dialog/OSK.cpp
@@ -96,7 +96,8 @@ OSK::OSK(osk::InputHandler* handler) : Form(true), handler(handler) {
     bpen = bpstart + bs * Vector2(linestart[3] + 10, 3);
     auto key = std::make_shared<Button>(VRect(bpen, bs));
     key->rect.size.x *= 1.25;
-    key->SetText("< <");
+    //key->SetText("< <");
+    key->style.glyph = ThemeManager::GetAsset("glyphs/backspace.small");
     key->eOnTap = [this](auto& btn){ this->handler->Backspace(); this->OnKey(); };
     touchScreen->Add(key);
     
@@ -104,7 +105,8 @@ OSK::OSK(osk::InputHandler* handler) : Form(true), handler(handler) {
     bpen = bpstart + bs * Vector2(linestart[4] + 8, 4);
     key = std::make_shared<Button>(VRect(bpen, bs));
     key->rect.size.x *= 2.5;
-    key->SetText("Enter");
+    //key->SetText("Enter");
+    key->style.glyph = ThemeManager::GetAsset("glyphs/enter.large");
     key->eOnTap = [this](auto& btn){ this->handler->Enter(); this->OnKey(); };
     touchScreen->Add(key);
     
diff --git a/libstarlight/source/starlight/gfx/DrawableImage.cpp b/libstarlight/source/starlight/gfx/DrawableImage.cpp
index 553e343..7bda68d 100644
--- a/libstarlight/source/starlight/gfx/DrawableImage.cpp
+++ b/libstarlight/source/starlight/gfx/DrawableImage.cpp
@@ -19,7 +19,7 @@ void DrawableImage::Draw(const Vector2& position, const Vector2& origin, OptRef<
     if (GFXManager::PrepareForDrawing()) {
         texture->Bind(color ? color.get() : Color(1,1,1,1));
         const VRect& sr = sampleRect ? sampleRect.get() : VRect(Vector2::zero, texture->size);
-        VRect rect(position - origin * scale, sr.size * scale);
+        VRect rect(position - (texture->size * origin) * scale, sr.size * scale);
         RenderCore::DrawQuad(rect, position, rotation, sr / texture->txSize);
     }
 }
diff --git a/libstarlight/source/starlight/ui/Button.cpp b/libstarlight/source/starlight/ui/Button.cpp
index 4d5dbcd..3015174 100644
--- a/libstarlight/source/starlight/ui/Button.cpp
+++ b/libstarlight/source/starlight/ui/Button.cpp
@@ -15,8 +15,15 @@ using starlight::InputManager;
 using starlight::GFXManager;
 using starlight::ThemeManager;
 
+using starlight::TextConfig;
+
 using starlight::ui::Button;
 
+std::function<TextConfig&()> Button::defCfg = []() -> TextConfig& {
+    static TextConfig _tc = ThemeManager::GetMetric("/controls/button/text", TextConfig());
+    return _tc;
+};
+
 void Button::SetText(const std::string& text) {
     label = text;
     MarkForRedraw();
@@ -28,18 +35,18 @@ void Button::Draw() {
     static auto idle = ThemeManager::GetAsset("controls/button.idle");
     static auto press = ThemeManager::GetAsset("controls/button.press");
     
-    static TextConfig tc = ThemeManager::GetMetric("/controls/button/text", TextConfig());
+    TextConfig& tc = style.textConfig.ROGet();
     
     auto rect = (this->rect + GFXManager::GetOffset()).IntSnap();
     
     if (InputManager::GetDragHandle() == this) {
-        press->Draw(rect);
+        (style.press ? style.press : press)->Draw(rect);
     } else {
-        idle->Draw(rect);
+        (style.idle ? style.idle : idle)->Draw(rect);
     }
     
-    //font->Print(rect, label, 1, cl/*Color::white*/, Vector2(0.5f, 0.5f), Color::black);
     tc.Print(rect, label);
+    if (style.glyph) style.glyph->Draw(rect.Center(), Vector2::half, nullptr, tc.textColor);
 }
 
 void Button::OnTouchOn() {
diff --git a/libstarlight/source/starlight/ui/Button.h b/libstarlight/source/starlight/ui/Button.h
index 49e0c15..8ca9708 100644
--- a/libstarlight/source/starlight/ui/Button.h
+++ b/libstarlight/source/starlight/ui/Button.h
@@ -4,15 +4,30 @@
 #include <string>
 #include <functional>
 
+#include "starlight/datatypes/Optional.h"
+
+#include "starlight/ThemeManager.h"
+#include "starlight/gfx/ThemeRef.h"
+
 #include "starlight/ui/UIElement.h"
 
 namespace starlight {
     namespace ui {
         class Button : public UIElement {
+        public:
+            struct Style {
+                gfx::ThemeRef<gfx::Drawable>
+                    idle = nullptr,
+                    press = nullptr,
+                    glyph = nullptr;
+                    Optional<TextConfig> textConfig = &Button::defCfg;
+            };
         private:
-            //
+            static std::function<TextConfig&()> defCfg;
             
         public:
+            Style style;
+            
             std::string label = "";
             std::function<void(Button&)> eOnTap;
             
diff --git a/libstarlight/source/starlight/ui/Label.cpp b/libstarlight/source/starlight/ui/Label.cpp
index e3f960f..a70e437 100644
--- a/libstarlight/source/starlight/ui/Label.cpp
+++ b/libstarlight/source/starlight/ui/Label.cpp
@@ -3,17 +3,22 @@
 #include "starlight/GFXManager.h"
 
 using starlight::GFXManager;
+using starlight::TextConfig;
 
 using starlight::ui::Label;
 
+std::function<TextConfig&()> Label::defCfg = []() -> TextConfig& {
+    static TextConfig _tc = ThemeManager::GetMetric<TextConfig>("/textPresets/normal.12", TextConfig());
+    return _tc;
+};
+
 Label::Label(VRect rect) {
     this->rect = rect;
-    textConfig = ThemeManager::GetMetric<TextConfig>("/textPresets/normal.12", TextConfig());
 }
 
 void Label::AutoSize() {
     if (autoSizeV) {
-        float h = textConfig.font->Measure(text, 1, rect.size.x).y;
+        float h = textConfig.ROGet().font->Measure(text, 1, rect.size.x).y;
         Resize(rect.size.x, h);
     }
     
@@ -28,12 +33,12 @@ void Label::SetText(const std::string& text) {
 }
 
 void Label::SetFont(const std::string& fontName) {
-    textConfig.font = ThemeManager::GetFont(fontName);
+    textConfig->font = ThemeManager::GetFont(fontName);
     AutoSize();
 }
 
 void Label::SetPreset(const std::string& name) {
-    textConfig = ThemeManager::GetMetric<TextConfig>("/textPresets/" + name, textConfig);
+    textConfig = ThemeManager::GetMetric<TextConfig>("/textPresets/" + name, textConfig.ROGet());
     AutoSize();
 }
 
@@ -48,7 +53,7 @@ void Label::PreDraw() {
         buffer = std::make_unique<gfx::DrawContextCanvas>(rect.size + Vector2(0, 8));
         buffer->Clear();
         GFXManager::PushContext(buffer.get());
-        textConfig.Print(buffer->rect, text);
+        textConfig.ROGet().Print(buffer->rect, text);
         GFXManager::PopContext();
     }
 }
@@ -58,6 +63,6 @@ void Label::Draw() {
     if (buffer) {
         buffer->Draw(VRect(rect.pos, buffer->rect.size));
     } else {
-        textConfig.Print(rect, text);
+        textConfig.ROGet().Print(rect, text);
     }
 }
diff --git a/libstarlight/source/starlight/ui/Label.h b/libstarlight/source/starlight/ui/Label.h
index db4792f..48f98d5 100644
--- a/libstarlight/source/starlight/ui/Label.h
+++ b/libstarlight/source/starlight/ui/Label.h
@@ -4,6 +4,8 @@
 #include <string>
 #include <memory>
 
+#include "starlight/datatypes/Optional.h"
+
 #include "starlight/ThemeManager.h"
 #include "starlight/gfx/ThemeRef.h"
 
@@ -15,11 +17,13 @@ namespace starlight {
     namespace ui {
         class Label : public UIElement {
         private:
+            static std::function<TextConfig&()> defCfg;
+            
             void AutoSize();
             
         public:
             std::string text = "";
-            TextConfig textConfig;
+            Optional<TextConfig> textConfig = &defCfg;
             
             std::unique_ptr<gfx::DrawContextCanvas> buffer;
             
diff --git a/libstarlight/source/starlight/ui/UIContainer.cpp b/libstarlight/source/starlight/ui/UIContainer.cpp
index 7c399b7..e634eaa 100644
--- a/libstarlight/source/starlight/ui/UIContainer.cpp
+++ b/libstarlight/source/starlight/ui/UIContainer.cpp
@@ -47,9 +47,9 @@ void UIContainer::_Dive(std::function<bool(UIElement*)>& func, bool consumable,
 }
 
 void UIContainer::Add(std::shared_ptr<UIElement> elem, bool front) {
-    if (front) children.push_front(elem);
-    else children.push_back(elem);
     elem->parent = std::weak_ptr<UIContainer>(std::static_pointer_cast<UIContainer>(this->shared_from_this()));
+    if (front) children.push_front(std::move(elem));
+    else children.push_back(std::move(elem));
     MarkForRedraw();
 }
 //void UIContainer::Add(UIElement* elem) {
diff --git a/libstarlight/source/starlight/ui/UIContainer.h b/libstarlight/source/starlight/ui/UIContainer.h
index 8a7d439..128fda5 100644
--- a/libstarlight/source/starlight/ui/UIContainer.h
+++ b/libstarlight/source/starlight/ui/UIContainer.h
@@ -35,6 +35,11 @@ namespace starlight {
             void Dive(std::function<bool(UIElement*)> func, bool consumable = true, bool frontFirst = true);
             
             void Add(std::shared_ptr<UIElement> elem, bool front = false);
+            template<class E, typename ... Args>
+            inline std::shared_ptr<E> AddNew(Args... args) {
+                auto n = std::make_shared<E>(args...);
+                Add(n); return n;
+            }
             //void Add(UIElement* elem);
             void Remove(std::shared_ptr<UIElement> elem);
             void RemoveAll();
diff --git a/libstarlight/todo.txt b/libstarlight/todo.txt
index 597c968..4bdca84 100644
--- a/libstarlight/todo.txt
+++ b/libstarlight/todo.txt
@@ -1,12 +1,29 @@
 
 
 
-roadmap to first release, in no particular order {
-    - ding!
+roadmap to v0.5.1 {
+    - add customization for Button (alternate idle/press images, optional glyph drawable) {
+        - also add (optional) TextConfig
+        - use that to spice up the OSK
+    }
+    figure out what to put on the left side of the keyboard (opposite backspace and enter)
+    temporary drawable loading, local themeref, discard etc.
+    ^ both png and raw load
+    maybe rgb565 for smdh icon loading?
+    some examples (minesweeper?)
+    proper thread dispatch?
 } then consider these before 1.0 "gold" {
     make closing forms a bit less finicky (add them to a separate list and let the Application remove them from the list)
-    add customization for Button (alternate idle/press images, optional glyph drawable)
-    ^ use that to spice up the OSK
+    garbage collection for not-recently-used theme assets {
+        keep track of last-use in ThemeRefContainer
+        have ThemeManager sweep gc every so often
+        rework redirects (proxy drawable I guess...?)
+    }
+    HANDLE CANVAS OVERRUNS FOR LABELS AND OSK PREVIEW {
+        - well, it doesn't actually *crash* anymore... or at least nowhere near as fast
+        use a "windowed" approach; only cache a bit more than is visible and redraw when the viewport changes enough
+        have a way for text rendering to skip lines that won't be visible, and use that with windowing to cut down render times further
+    }
     actual cursor image for OSK instead of just using a | glypyh
     input prompt dialog
     "shortcut" overloads for InputManager::OpenKeyboard
diff --git a/testbed/source/Core.cpp b/testbed/source/Core.cpp
index 4ed5928..6616243 100644
--- a/testbed/source/Core.cpp
+++ b/testbed/source/Core.cpp
@@ -42,9 +42,9 @@ void Core::Init() {
     touchScreen->Add(container);
     
     auto label = std::make_shared<sl::ui::Label>(VRect(0,0,320,0));
-    label->textConfig.justification = Vector2::half;
+    label->textConfig->justification = Vector2::half;
     label->autoSizeV = true;
-    label->SetText("~libstarlight UI test~\n\nHello. I'm a label.\nI have multiple lines and can resize to fit my content. Did you know that miles per gallon is actually a measure of volume?");
+    label->SetText("~libstarlight UI test~\n\nHello. I'm a label.\nI have multiple lines and can resize to fit my content. Did you know that miles per gallon is actually a measure of volume? " + std::to_string(sizeof(std::unique_ptr<sl::ui::Label>)));
     container->Add(label);
     
     auto button = std::make_shared<sl::ui::Button>(VRect(64,80,128,32));
@@ -54,7 +54,7 @@ void Core::Init() {
         auto form = std::make_shared<sl::ui::Form>(true);
         
         auto label = std::make_shared<sl::ui::Label>(VRect(0,0,320,0));
-        label->textConfig.justification = Vector2::half;
+        label->textConfig->justification = Vector2::half;
         label->autoSizeV = true;
         label->SetText("This is a form, coming in and nuking the non-form UI elements. Whoops.");
         form->touchScreen->Add(label);
@@ -69,8 +69,8 @@ void Core::Init() {
         auto tlbl = std::make_shared<sl::ui::Label>(VRect(2, 2, 396, 0));
         tlbl->autoSizeV = true;
         tlbl->SetPreset("normal.16");
-        tlbl->textConfig.justification = Vector2::zero;
-        tlbl->textConfig.borderColor = Color::black;
+        tlbl->textConfig->justification = Vector2::zero;
+        tlbl->textConfig->borderColor = Color::black;
         tlbl->SetText("3DS:~# sudo make me a sandwich_");
         form->topScreen->Add(tlbl);
         
@@ -100,8 +100,8 @@ void Core::Init() {
     
     auto pipf = std::make_shared<sl::ui::Label>(VRect(0,0,400,240));
     pipf->SetPreset("normal.16");
-    pipf->textConfig.borderColor = Color::black;
-    pipf->textConfig.justification = Vector2::half;
+    pipf->textConfig->borderColor = Color::black;
+    pipf->textConfig->justification = Vector2::half;
     pipf->SetText("This label is on a parallax layer. Try moving the 3D slider.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
     parallax->Add(pipf);
     
diff --git a/themes/default/glyphs/backspace.large.png b/themes/default/glyphs/backspace.large.png
new file mode 100644
index 0000000000000000000000000000000000000000..a76e1818a8ff64ff6a520769e73648edf86be0f3
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=kXeY|kgx6NtJ6Rs+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g
z9Vouq)5S3);_%z47kLjW@VNA!JHYhw4bz%SGi@E)6s%+F?{K)5hOU^p;M99zop%S=
z85{*zWGCpTwEpEd`KP-;P9$%ovs%cWOY9%T>NBEOZG61Q)cT&azT4ZnJ6Vg)I~?D*
z-D&-t6NzieBqd(_yj>9ax+dAd=1}U|;x)U^{<slyyXmxZ#WzzE;|W2x8169U$k*s)
yC9z)ErpO#onrCS(T<8B$Wd22w`-K85^=E}YCMkwge%lrg@{gyhpUXO@geCw<G;t^Z

literal 0
HcmV?d00001

diff --git a/themes/default/glyphs/backspace.small.png b/themes/default/glyphs/backspace.small.png
new file mode 100644
index 0000000000000000000000000000000000000000..871802c275ea62aeb7a271b44cb91c6a457fa858
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=kXeXdUtPe=w*n|6n;8;O;+&tGo0?Yw<T5Zg7o{eaq^2m8XO?6rxO@5rr0Aux
z1I6chx;TbJ9DY0HHgB^5k88e`+X<$cGRA2M3~Fx$W;Q6k;A@}Xps;FI&^#x*`P&{<
zC#z56Ic(6=${;H6qnF{w+Lpge4`+6+J+hns=<FL4GuL%*OyhW?$`_z|S29}8ca8A`
zLHWGb#m}!vaQr`GVf)?pap70}@^>746)mpk8j9cX+Nf@wbm{iAjsLPIWj96z?L2OA
jF4ARs#L>1yiS0|-P2cHXHu^N}6vzjju6{1-oD!M<aA0X`

literal 0
HcmV?d00001

diff --git a/themes/default/glyphs/backspace.xcf b/themes/default/glyphs/backspace.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..06a261fc66db1e890d0af65d21eb34deebbab244
GIT binary patch
literal 3906
zcmeHJJ#QOF5S=}KA9*4rGjWrT?JOIRAtM0c+799bkbrbbk%pp<)WM`^kW3_31cEf_
z+yqGD-Y)zD5~K={f=!U0kX~-pB$77o?d=gq>1;!g?ZWT??{;=(cJ^!T-u0rv1AWlx
z>hIUrKNE;{puP+!g~t`3eCLq}0ciqx;2Q9u(;4>x;_smidPuw084d>F-UNN2bLH+R
zY)`@+y&p|>^}Vk)zow^QL!&{v7q0b2(GG2hR<b&tJnV;hJnTn1*ZtLQuQTiqM|#yZ
zYop$FTd&_-x00dUa<1zbx}7mJ@#_~W9C|Q*(C$QgJ$);g3&w|8MrT|5ZZDeXXs@#y
zjyZnV?T*9Ae1RN&-V|FFhw>bps6Rw<e~A=-z%BeM;{S#dzL9v*Y6qTjvELr`LMZYv
zACMxz%Q8UO>5Qy69gTdH(*2ZPP3g6i9;Ea-bmmQ@1cmcal0sR6{wa{y>4SJb#_fCu
z@O!^3+Po+1PxE5tP*pi;&5UnOW=*NdNpofbb8^@eANrxGo6{L~M>TJbw_1nBGslOm
zEu&0qEtsR0z-ut11#8*H7R?d*%^7mSr%cIO%QmrRbq}^v&WrpWwOp2g^Dd6c&Y!)O
zcnfFOjSVBK-5Awmzd`C8rpg|!#$geZx~+wq-KakaN8t`lp8)C0dL6~VV!BLmun?W(
ze@2b`iH>&2q5sr5oh|<>`}1NzVW8`L(p=oK9<;~z8Gg}yvS4|h+*<>{Iw(m!^Br+g
z_#BFMKzQLB=Ww>dF8kB>HS6BdSJbQ@U*M>{&tprME3YE!8X5OCzhxdLjHSf8r)US1
zN$Je}m)!l=BrtVpm_SxcRf<MQ0q~43CF4mB@bG!6pjEbCmZ~X89$%Qi<Pe**i9H>g
z&XLYt!(0L8Y#_%}6;XxnSCO1W>eg&!jR)<1AI6vRCjD=-*2t|Hyjl633xQ|{e5xvc
z(*V&iD*vEe_)JdKhUJTr<;}X~5zA#uj@^#Pm4-}d1g|L=Cuf<Gl-PoeR7*}J)q3(D
zblSj!#W^D?)Z013`B7QfvsRH><Z^25Q}qQmryZ!*?fqqP9j}*?ytr8(5yo8PVi|uK
z&f{ORlj=_*RdSkkz(=I|*g2i8`i%V-ao*zA-xTLvbxT51yN!o-z){pTpi^{=+PCby
z)Ai=Zhkk~qa27&jl^BoYA|=N7%aj;@Tbu;XoubhaC^7!wSkZU_OE!M0HpMq9;EM*h
vM}e0V_^1y4iFrwxCGb@NTor(;a_}c@Vo%4Wb1Wn0737|(FHsrq&Mf}}it1^-

literal 0
HcmV?d00001

diff --git a/themes/default/glyphs/enter.large.png b/themes/default/glyphs/enter.large.png
new file mode 100644
index 0000000000000000000000000000000000000000..d337364a7aba6d7213caa0fbdc4fdf932fb4f170
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=kXcC7SpTK=zKuX3+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g
z9Vp)D>Eaj?aro_&gS-s}Jj}93I8sHYB`~DvaT~bYJXrI)DL_hT;ho)G{$W8198C}U
zCoK8)HbKL1x0!=cHTQ+JtzHV><>r`hhjDHwuP78;ark}Pq?q{}9cnTM_!PFD=suBp
zY{iVgxGCGe{^(F+a8Lg6=_g;ry=}j^)~NnrX;R?Ov0yyrG41H7hXF@HuJm;Eb6Mw<
G&;$V30a}Fs

literal 0
HcmV?d00001

diff --git a/themes/default/glyphs/enter.small.png b/themes/default/glyphs/enter.small.png
new file mode 100644
index 0000000000000000000000000000000000000000..1faf0d4bb677e6b4d6a2d0dbd498467bbc335a13
GIT binary patch
literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=kXcC7NGH?so)=I^HZvrm#5q4VH#M&W$Yo$~E=o--Nlj5G&n(GMaQE~LNYP7W
z2Z|?qx;TbJ9DaNGAZLRCPwPXaz6p^rM`zv+wL0?tXtVgz#$}9^_btEJIt6!ibo}9M
zNU!78DqNDsuwo+Px2?~1GfaH=SC_%!Fqh3?_nv*bt*uIq=bXOdz^e0<e~p!~x2}Sc
a(&pGNyO)%$ig}<6a)+m@pUXO@geCyI$xZ11

literal 0
HcmV?d00001

diff --git a/themes/default/glyphs/enter.xcf b/themes/default/glyphs/enter.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..9dcabc06f54bd7e4ad15c9afa08bc9db3f115272
GIT binary patch
literal 3046
zcmd5-%}x_h6u#5{nF1{^pb3I^SrSW%M&iPiF3?01;|8}wnGO^C1MMiVV&en2^bt&a
z2ora#T$=a_B)$N&<M-XU(@e3N5V3NSZ_eNSJ?EY?p5NM&hxLYhTdUm@AgMul7BCEa
z=7GYa_d*aL8^{1RfkiEI+ycgLf=_!`wp#DBT5dalF6f+l+;yG6-H``=uq!v8K7T<^
zSq=4Dj^|druD?SYMjN8i3yzwu>~)&{&Z<>uc=b-R)0Gv)s$Fl}k+rp&qA|j{cCBLS
z_L!-$U;bX;)WhDMQ}^4RT#xsH@o1b;+p2HcejxpJeb?=Aey7psxxw&&oc*gQvW!k;
z95fkUgh*F~$UYGwkB}D}A*`3N7hGx}ZX(xox}FO`Eb{}(0Zdj16tv8drk26Pt%PhP
z<YGdeO32d*xdfT(#*~M^{Yddc;hMJr+PSx;)H^Lma033+2XK;%korjFI3vO#jQe5`
z;(q;b11Il?C-@rSU_&gCo#5T}?GX1)g|p(^K8?h(ID;69tQc&CMp(j_({KuWhEryg
zYK8q1Ta@(3rD!sCz-q_FU7kZ~P%f!ZuQmK;;C9^|npS{hEK)Rrt|AAF+u!8ihB}G*
zq|XuRI}oKt8hTl|hPDiSBXNgH8)1)LUACOwYnU&6&l${#-vsx^IY{xdVSmw-`2;~~
z7?|~0JG3qHmHP2Dc^Xy}pRRMjQzc&ojy^U@95=~|WMym0u{udo16j!N%p@5hw?<_c
zUR8cZxQu#RMw!jC9$9a5FyvL;r4%otx=NxHmc=xDDK%k*gIP}3d9~=)>h>yQy_VB#
zG6a9>s`O7Xhpd*kt8#Bm`R`hg-~=ix{{x&PBjg8Eh8>mN)d((jRa<qw4038mtuQUl
zx6nf8RI@A~?G}4yq~=uboFDC(``krpP%f!Jj_sL@GwG^(CD*;||B5|HlUYGhUqO)?
zh`RYuJGISxMm-r#sM;s&(JTL}UYX?)A~L^$OATD#JdNzJ%{-$%nS@)>?Jsmf97+)5
za?P_%vWnt=G`21B$3v1D$aN9<S0wQTiVvs_gQq*;B5Q}0vH)aN#aO71A}YrW7oqE}
JxBp*e{shjQ=IH<c

literal 0
HcmV?d00001