proper destructior(s), moar setting

src/gui/gui.cpp

@@ -8286,6 +8286,9 @@ bool FurnaceGUI::finish(bool saveConfig) {
     SDL_HapticClose(vibrator);
   }
 
+  for (SettingsCategory i:settings.categories) destroySettingsCategories(i);
+  settings.categories.clear();
+
   for (int i=0; i<DIV_MAX_OUTPUTS; i++) {
     if (oscValues[i]) {
       delete[] oscValues[i];

src/gui/gui.h

@@ -1610,6 +1610,7 @@ class SettingDef {
     virtual void drawSetting(bool& changed);
     virtual void saveSetting(DivConfig* conf);
     virtual void loadSetting(DivConfig* conf);
+    virtual ~SettingDef();
 };
 
 class SettingsCategory {
@@ -2968,6 +2969,7 @@ class FurnaceGUI {
   void writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups=GUI_SETTINGS_ALL);
 
   void setupSettingsCategories();
+  void destroySettingsCategories(SettingsCategory& cat);
   void drawSettingsCategory(SettingsCategory* cat);
   void searchDrawSettingItems(SettingsCategory* cat);
   void drawSettingsItems();

src/gui/settings.cpp

@@ -295,6 +295,11 @@ const char* oscRenderEngines[2]={
   _("GLSL (if available)")
 };
 
+const char* memUsageUnits[2]={
+  _("Bytes##MUU0"),
+  _("Kilobytes##MUU1")
+};
+
 #define SAMPLE_RATE_SELECTABLE(x) \
   if (ImGui::Selectable(#x,settings.audioRate==x)) { \
     settings.audioRate=x; \
@@ -361,6 +366,9 @@ const char* oscRenderEngines[2]={
 void FurnaceGUI::setupSettingsCategories() {
   settings.categories={
     SettingsCategory("Window",{
+      SettingsCategory("Memory Composition",{},{
+        new SettingRadio(&settings.memUsageUnit,"memUsageUnit",_("Chip memory usage unit:"),NULL,1,memUsageUnits,2),
+      }),
       SettingsCategory("Oscilloscope",{},{
         new SettingDummyText("%c",&settingsChanged),
         new SettingRadio(&settings.shaderOsc,"shaderOsc",_("Oscilloscope rendering engine:"),_("render using either Dear ImGui's built-in line drawing functions or GLSL."),0,oscRenderEngines,2),
@@ -392,6 +400,19 @@ void FurnaceGUI::setupSettingsCategories() {
   settings.activeCategory=settings.categories[0];
 }
 
+void FurnaceGUI::destroySettingsCategories(SettingsCategory& cat) {
+  if (cat.children.size()>0) {
+    for (SettingsCategory i:cat.children) {
+      destroySettingsCategories(i);
+    }
+  }
+  for (SettingDef* i:cat.settings) {
+    delete i;
+  }
+  cat.settings.clear();
+  cat.children.clear();
+}
+
 void FurnaceGUI::drawSettingsCategory(SettingsCategory* cat) {
   if (cat->children.size()>0) {
     ImGuiTreeNodeFlags f=ImGuiTreeNodeFlags_OpenOnDoubleClick;
@@ -674,41 +695,41 @@ void FurnaceGUI::drawSettings() {
       CONFIG_SECTION("test") {
         CONFIG_SUBSECTION("here");
 
-  if (ImGui::BeginTable("set3", 2,ImGuiTableFlags_Resizable|ImGuiTableFlags_BordersInner)) {
-    ImGui::TableNextRow();
-    ImGui::TableNextColumn();
-    if (ImGui::BeginChild("SettingCategories",ImGui::GetContentRegionAvail(),false)) {
-      settings.filter.Draw(_("Search"));
-      ImGui::SameLine();
-      ImGui::Button(ICON_FA_BARS "##SettingsSearchDepth");
-      if (ImGui::BeginPopupContextItem("SettingsSearchDepth",ImGuiPopupFlags_MouseButtonLeft)) {
-        ImGui::Text("Search where:");
-        ImGui::Indent();
-        if (ImGui::RadioButton("Setting names", settings.searchDepth==1)) {
-          settings.searchDepth=1;
-        }
-        if (ImGui::RadioButton("Setting descriptions", settings.searchDepth==2)) {
-          settings.searchDepth=2;
-        }
-        if (ImGui::RadioButton("Setting names and descriptions", settings.searchDepth==3)) {
-          settings.searchDepth=3;
+    if (ImGui::BeginTable("set3", 2,ImGuiTableFlags_Resizable|ImGuiTableFlags_BordersInner)) {
+      ImGui::TableNextRow();
+      ImGui::TableNextColumn();
+      if (ImGui::BeginChild("SettingCategories",ImGui::GetContentRegionAvail(),false)) {
+        settings.filter.Draw(_("Search"));
+        ImGui::SameLine();
+        ImGui::Button(ICON_FA_BARS "##SettingsSearchDepth");
+        if (ImGui::BeginPopupContextItem("SettingsSearchDepth",ImGuiPopupFlags_MouseButtonLeft)) {
+          ImGui::Text("Search where:");
+          ImGui::Indent();
+          if (ImGui::RadioButton("Setting names", settings.searchDepth==1)) {
+            settings.searchDepth=1;
+          }
+          if (ImGui::RadioButton("Setting descriptions", settings.searchDepth==2)) {
+            settings.searchDepth=2;
+          }
+          if (ImGui::RadioButton("Setting names and descriptions", settings.searchDepth==3)) {
+            settings.searchDepth=3;
+          }
+          ImGui::Unindent();
+          ImGui::EndPopup();
         }
-        ImGui::Unindent();
-        ImGui::EndPopup();
+        for (SettingsCategory cat:settings.categories) drawSettingsCategory(&cat);
+        ImGui::EndChild();
       }
-      for (SettingsCategory cat:settings.categories) drawSettingsCategory(&cat);
-      ImGui::EndChild();
-    }
-    ImGui::TableNextColumn();
-    if (ImGui::BeginChild("SettingsItems",ImGui::GetContentRegionAvail(),false)) {
-      drawSettingsItems();
-      if ((strncmp(settings.filter.InputBuf,"Cheats",7)==0) && !nonLatchNibble) {
-        ImGui::Text("gotta unlock them first!");
+      ImGui::TableNextColumn();
+      if (ImGui::BeginChild("SettingsItems",ImGui::GetContentRegionAvail(),false)) {
+        drawSettingsItems();
+        if ((strncmp(settings.filter.InputBuf,"Cheats",7)==0) && !nonLatchNibble) {
+          ImGui::Text("gotta unlock them first!");
+        }
+        ImGui::EndChild();
       }
-      ImGui::EndChild();
+      ImGui::EndTable();
     }
-    ImGui::EndTable();
-  }
 
         END_SECTION;
       }

src/gui/settingsDef.h

@@ -52,6 +52,9 @@ void SettingDef::loadSetting(DivConfig* conf) {
   *(int*)data=conf->getInt(name, 0);
 }
 
+SettingDef::~SettingDef() {
+}
+
 // children
 
 class SettingCheckbox : public SettingDef {
@@ -98,6 +101,8 @@ class SettingCheckbox : public SettingDef {
       tooltip=_tooltip;
       fallback=_fallback;
     }
+    ~SettingCheckbox() {
+    }
 };
 
 class SettingSliderInt : public SettingDef {
@@ -177,6 +182,8 @@ class SettingSliderInt : public SettingDef {
       sliderFmt=fmt;
       f=flags;
     }
+    ~SettingSliderInt() {
+    }
 };
 
 class SettingSliderFloat : public SettingDef {
@@ -256,6 +263,8 @@ class SettingSliderFloat : public SettingDef {
       sliderFmt=fmt;
       f=flags;
     }
+    ~SettingSliderFloat() {
+    }
 };
 
 class SettingInputInt : public SettingDef {
@@ -335,6 +344,8 @@ class SettingInputInt : public SettingDef {
       sliderFmt=fmt;
       f=flags;
     }
+    ~SettingInputInt() {
+    }
 };
 
 class SettingDropdown : public SettingDef {
@@ -347,19 +358,21 @@ class SettingDropdown : public SettingDef {
   const char** options;
   int optionsCount;
   ImGuiComboFlags f;
-  std::function<void()> interact;
+  std::function<void()> interactFunc;
+  std::function<void()> setupFunc;
   public:
     bool passesFilter(ImGuiTextFilter* filter, unsigned char toWhat) {
       return (filter->PassFilter(friendlyName) && toWhat&1) ||
              (filter->PassFilter(tooltip) && toWhat&2);
     }
     void drawSetting(bool& changed) {
+      setupFunc();
       if (ImGui::BeginCombo(friendlyName,options[*(int*)data],f)) {
         for (unsigned short i=0; i<optionsCount; i++) {
           if (ImGui::Selectable(options[i],i==*(int*)data)) {
             *(int*)data=i;
             changed=true;
-            interact();
+            interactFunc();
           }
         }
         ImGui::EndCombo();
@@ -388,10 +401,12 @@ class SettingDropdown : public SettingDef {
       options(NULL),
       optionsCount(0),
       f(0),
-      interact([]{}) {}
+      interactFunc([]{}),
+      setupFunc([]{}) {}
     SettingDropdown(int* _data, String _name, const char* _friendlyName, const char* _tooltip, int _fallback, const char** _options, int _optionsCount):
       f(0),
-      interact([]{}) {
+      interactFunc([]{}),
+      setupFunc([]{}) {
       data=_data;
       name=_name;
       friendlyName=_friendlyName;
@@ -401,7 +416,19 @@ class SettingDropdown : public SettingDef {
       optionsCount=_optionsCount;
     }
     SettingDropdown(int* _data, String _name, const char* _friendlyName, const char* _tooltip, int _fallback, const char** _options, int _optionsCount, ImGuiComboFlags flags):
-      interact([]{}) {
+      interactFunc([]{}),
+      setupFunc([]{}) {
+      data=_data;
+      name=_name;
+      friendlyName=_friendlyName;
+      tooltip=_tooltip;
+      fallback=_fallback;
+      options=_options;
+      optionsCount=_optionsCount;
+      f=flags;
+    }
+    SettingDropdown(int* _data, String _name, const char* _friendlyName, const char* _tooltip, int _fallback, const char** _options, int _optionsCount, ImGuiComboFlags flags, std::function<void()> _interactFunc):
+      setupFunc([]{}) {
       data=_data;
       name=_name;
       friendlyName=_friendlyName;
@@ -410,8 +437,9 @@ class SettingDropdown : public SettingDef {
       options=_options;
       optionsCount=_optionsCount;
       f=flags;
+      interactFunc=_interactFunc;
     }
-    SettingDropdown(int* _data, String _name, const char* _friendlyName, const char* _tooltip, int _fallback, const char** _options, int _optionsCount, ImGuiComboFlags flags, std::function<void()> _interact) {
+    SettingDropdown(int* _data, String _name, const char* _friendlyName, const char* _tooltip, int _fallback, const char** _options, int _optionsCount, ImGuiComboFlags flags, std::function<void()> _interactFunc, std::function<void()> _setupFunc) {
       data=_data;
       name=_name;
       friendlyName=_friendlyName;
@@ -420,7 +448,10 @@ class SettingDropdown : public SettingDef {
       options=_options;
       optionsCount=_optionsCount;
       f=flags;
-      interact=_interact;
+      interactFunc=_interactFunc;
+      setupFunc=_setupFunc;
+    }
+    ~SettingDropdown() {
     }
 };
 
@@ -480,6 +511,8 @@ class SettingRadio : public SettingDef {
       options=_options;
       optionsCount=_optionsCount;
     }
+    ~SettingRadio() {
+    }
 };
 
 class SettingDummyText : public SettingDef {
@@ -508,6 +541,8 @@ class SettingDummyText : public SettingDef {
       va_start(args,_fmt);
       va_end(args);
     }
+    ~SettingDummyText() {
+    }
 };
 
 #endif