#229 theme builder did not copy icons

TcMenu · Aug 26, 2024 · 44ef11c · 44ef11c
1 parent 402a49f
commit 44ef11c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/graphics/GraphicsDeviceRenderer.cpp b/src/graphics/GraphicsDeviceRenderer.cpp
@@ -494,6 +494,8 @@ namespace tcgfx {
     void GraphicsDeviceRenderer::enableCardLayout(const DrawableIcon& left, const DrawableIcon& right, MenuTouchScreenManager* touchScreenManager, bool monoDisplay) {
         if(cardLayoutPane == nullptr) {
             cardLayoutPane = new CardLayoutPane(&left, &right, touchScreenManager, monoDisplay);
+        } else {
+            serlogF(SER_TCMENU_INFO, "Card already init");
         }
     }
 

diff --git a/src/graphics/TcThemeBuilder.cpp b/src/graphics/TcThemeBuilder.cpp
@@ -102,10 +102,9 @@ ThemePropertiesBuilder &TcThemeBuilder::menuItemOverride(MenuItem &item) {
 }
 
 TcThemeBuilder& TcThemeBuilder::enableCardLayoutWithXbmImages(Coord iconSize, const uint8_t *leftIcon, const uint8_t *rightIcon, bool isMono) {
-    renderer.enableCardLayout(
-            DrawableIcon(-1, iconSize, tcgfx::DrawableIcon::ICON_XBITMAP, leftIcon, nullptr),
-            DrawableIcon(-1, iconSize, tcgfx::DrawableIcon::ICON_XBITMAP, rightIcon, nullptr),
-            nullptr, isMono);
+    auto left = new DrawableIcon(-1, iconSize, tcgfx::DrawableIcon::ICON_XBITMAP, leftIcon, nullptr);
+    auto right = new DrawableIcon(-1, iconSize, tcgfx::DrawableIcon::ICON_XBITMAP, rightIcon, nullptr);
+    renderer.enableCardLayout(*left, *right, nullptr, isMono);
     return *this;
 }
 
@@ -137,3 +136,4 @@ TcThemeBuilder& TcThemeBuilder::manualDimensions(int x, int y) {
     renderer.setDisplayDimensions(x, y);
     return *this;
 }
+
diff --git a/src/graphics/TcThemeBuilder.h b/src/graphics/TcThemeBuilder.h
@@ -93,7 +93,7 @@ namespace tcgfx {
          * @param mag the magnification value
          * @return reference to itself for chaining
          */
-        ThemePropertiesBuilder& withNativeFont(void* data, uint8_t mag) {
+        ThemePropertiesBuilder& withNativeFont(const void* data, uint8_t mag) {
             fontData = data;
             fontMag = mag;
             needsProps();
@@ -349,7 +349,7 @@ namespace tcgfx {
          * @param mag the native mag value
          * @return reference to itself for chaining
          */
-        TcThemeBuilder& withNativeFont(void* data, uint8_t mag) {
+        TcThemeBuilder& withNativeFont(const void* data, uint8_t mag) {
             fontData = data;
             fontMag = mag;
             return *this;