# Changes

- Remove Scene Logic and only use Update as func
- Begin with UI7 Horizontal scrollin gimpl and add Alignment funcs (not functional yet)
- Generate a Lookup Table for Languages for faster access

include/pd/ThemeEditor.hpp

@@ -8,8 +8,7 @@ class ThemeEditor : public Palladium::Scene {
   ThemeEditor();
   ~ThemeEditor();
 
-  void Draw(void) const override;
-  void Logic() override;
+  void Update() override;
 
  private:
   Theme::Ref edit_theme;
@@ -17,13 +16,13 @@ class ThemeEditor : public Palladium::Scene {
   Theme::Ref temp_theme;
 
   // temp vars for samples
-  mutable bool cm;
-  mutable std::string inpt;
-  mutable int menu = 0;
+  bool cm;
+  std::string inpt;
+  int menu = 0;
 
   // Keyboard
-  mutable PDKeyboardState kbd_state;
-  mutable std::string kbd_text;
-  mutable std::vector<std::string> theme_list;
+  PDKeyboardState kbd_state;
+  std::string kbd_text;
+  std::vector<std::string> theme_list;
 };
 }  // namespace Palladium

include/pd/UI7.hpp

@@ -14,7 +14,9 @@ enum UI7MenuFlags_ {
   UI7MenuFlags_None = 0,
   UI7MenuFlags_NoTitlebar = UI7MAKEFLAG(0),
   UI7MenuFlags_TitleMid = UI7MAKEFLAG(1),
-  UI7MenuFlags_Scrolling = MAKEFLAG(2),
+  UI7MenuFlags_HzScrolling = MAKEFLAG(2),
+  UI7MenuFlags_VtScrolling = MAKEFLAG(3),
+  UI7MenuFlags_Scrolling = UI7MenuFlags_HzScrolling | UI7MenuFlags_VtScrolling,
 };
 
 enum UI7Horizontal {
@@ -121,6 +123,11 @@ float GetScrollingOffset();
 void SetScrollingOffset(float off);
 bool IsScrolling();
 }  // namespace Menu
+namespace Next {
+// Alignment in ScreenSpace
+void Align(UI7Horizontal hz = UI7Horizontal_Left,
+           UI7Vertical vt = UI7Vertical_Top);
+}  // namespace Next
 // DrawLists
 UI7DrawList::Ref GetForegroundList();
 UI7DrawList::Ref GetBackgroundList();

include/pd/palladium.hpp

@@ -15,19 +15,19 @@
 #include <3ds.h>
 #include <citro3d.h>
 /// Palladium Includes
-#include <pd/base/Color.hpp>
-#include <pd/base/FunctionTrace.hpp>
 #include <pd/Hardware.hpp>
-#include <pd/base/Memory.hpp>
 #include <pd/Overlays.hpp>
 #include <pd/Ovl.hpp>
 #include <pd/ResultDecoder.hpp>
 #include <pd/Sprite.hpp>
 #include <pd/Tasks.hpp>
 #include <pd/Time.hpp>
+#include <pd/base/Color.hpp>
+#include <pd/base/FunctionTrace.hpp>
 #include <pd/base/Lang.hpp>
-#include <pd/parameter.hpp>
+#include <pd/base/Memory.hpp>
 #include <pd/base/stringtool.hpp>
+#include <pd/parameter.hpp>
 #include <pd/thread.hpp>
 
 #define PDVSTRING "1.0.0"
@@ -49,9 +49,7 @@ class Scene {
   static std::stack<std::unique_ptr<Scene>> scenes;
   /// @brief Deconstructor
   virtual ~Scene() {}
-  virtual void Logic() = 0;
-  /// @brief Draw Func to Override
-  virtual void Draw() const = 0;
+  virtual void Update() = 0;
   /// @brief Push a Scene to Stack
   /// @param scene Scene to Push
   /// @param fade FadeEffect (Not Correctly Implementet yet)
@@ -59,8 +57,7 @@ class Scene {
   /// @brief Go Back a Scene
   static void Back();
   /// @brief do the Draw (Called in Palladium::MainLoop())
-  static void doDraw();
-  static void doLogic();
+  static void doUpdate();
 };
 
 /// @brief Integrated Setting Menu of Palladium
@@ -102,12 +99,9 @@ class RSettings : public Palladium::Scene {
  public:
   /// @brief Constructor
   RSettings();
-  /// @brief Override for Draw
-  /// @param
-  void Draw(void) const override;
   /// @brief Deconstructor
   ~RSettings();
-  void Logic() override;
+  void Update() override;
 };
 
 /// @brief Show Up the Palladium-Settings Menu