From 936dd0a5ba81356fa826141343a72281e2dfdb14 Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Thu, 10 Oct 2024 14:25:12 -0500
Subject: [PATCH] GUI: too many settings

---
 src/gui/gui.h           |  4 ----
 src/gui/newSong.cpp     |  4 ++--
 src/gui/settings.cpp    | 32 --------------------------------
 src/gui/sysManager.cpp  |  6 +++---
 src/gui/sysMiscInfo.cpp |  2 +-
 src/gui/sysPicker.cpp   |  4 ++--
 6 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/src/gui/gui.h b/src/gui/gui.h
index c3c3932cd..baf460ee0 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1999,8 +1999,6 @@ class FurnaceGUI {
     float vibrationStrength;
     int vibrationLength;
     int s3mOPL3;
-    int chipManagerTooltip;
-    int sysTooltipChanInfoStyle;
     String mainFontPath;
     String headFontPath;
     String patFontPath;
@@ -2260,8 +2258,6 @@ class FurnaceGUI {
       vibrationStrength(0.5f),
       vibrationLength(20),
       s3mOPL3(1),
-      chipManagerTooltip(1),
-      sysTooltipChanInfoStyle(3),
       mainFontPath(""),
       headFontPath(""),
       patFontPath(""),
diff --git a/src/gui/newSong.cpp b/src/gui/newSong.cpp
index 226e5e021..1609eaf34 100644
--- a/src/gui/newSong.cpp
+++ b/src/gui/newSong.cpp
@@ -81,8 +81,8 @@ void FurnaceGUI::drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& acce
           ImGui::PushTextWrapPos(MIN(scrW*dpiScale,400.0f*dpiScale));
           ImGui::Text("%s (x%d): ",sysDef->name,chipCounts[chip]);
           ImGui::Text("%s",sysDef->description);
-          if (settings.sysTooltipChanInfoStyle&1) drawSystemChannelInfoText(sysDef);
-          if (settings.sysTooltipChanInfoStyle&2) drawSystemChannelInfo(sysDef);
+          drawSystemChannelInfoText(sysDef);
+          drawSystemChannelInfo(sysDef);
           ImGui::PopTextWrapPos();
           if (chipIndex+1<chips.size()) {
             ImGui::Separator();
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index c9b99e7a6..b9006af5f 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -3315,32 +3315,6 @@ void FurnaceGUI::drawSettings() {
           settingsChanged=true;
         }
 
-        bool chipManagerTooltipB=settings.chipManagerTooltip;
-        if (ImGui::Checkbox("Show system tooltips in the chip manager",&chipManagerTooltipB)) {
-          settings.chipManagerTooltip=chipManagerTooltipB;
-          settingsChanged=true;
-        }
-
-        ImGui::Text("System tooltip channel information style:");
-        ImGui::Indent();
-        if (ImGui::RadioButton("None##stciNO",settings.sysTooltipChanInfoStyle==0)) {
-          settings.sysTooltipChanInfoStyle=0;
-          settingsChanged=true;
-        }
-        if (ImGui::RadioButton("Text##stciTX",settings.sysTooltipChanInfoStyle==1)) {
-          settings.sysTooltipChanInfoStyle=1;
-          settingsChanged=true;
-        }
-        if (ImGui::RadioButton("Color... things?##stciCO",settings.sysTooltipChanInfoStyle==2)) {
-          settings.sysTooltipChanInfoStyle=2; // retext!!!
-          settingsChanged=true;
-        }
-        if (ImGui::RadioButton("Both##stciTC",settings.sysTooltipChanInfoStyle==3)) {
-          settings.sysTooltipChanInfoStyle=3;
-          settingsChanged=true;
-        }
-        ImGui::Unindent();
-
         // SUBSECTION ORDERS
         CONFIG_SUBSECTION(_("Orders"));
         // sorry. temporarily disabled until ImGui has a way to add separators in tables arbitrarily.
@@ -5092,8 +5066,6 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
     settings.macroLayout=conf.getInt("macroLayout",0);
     settings.controlLayout=conf.getInt("controlLayout",3);
     settings.classicChipOptions=conf.getInt("classicChipOptions",0);
-    settings.chipManagerTooltip=conf.getInt("chipManagerTooltip",1);
-    settings.sysTooltipChanInfoStyle=conf.getInt("sysTooltipChanInfoStyle",3);
   }
 
   if (groups&GUI_SETTINGS_COLOR) {
@@ -5399,8 +5371,6 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
   clampSetting(settings.autoFillSave,0,1);
   clampSetting(settings.autoMacroStepSize,0,2);
   clampSetting(settings.s3mOPL3,0,1);
-  clampSetting(settings.chipManagerTooltip,0,1);
-  clampSetting(settings.sysTooltipChanInfoStyle,0,3);
 
   if (settings.exportLoops<0.0) settings.exportLoops=0.0;
   if (settings.exportFadeOut<0.0) settings.exportFadeOut=0.0;  
@@ -5687,8 +5657,6 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
     conf.set("macroLayout",settings.macroLayout);
     conf.set("controlLayout",settings.controlLayout);
     conf.set("classicChipOptions",settings.classicChipOptions);
-    conf.set("chipManagerTooltip",settings.chipManagerTooltip);
-    conf.set("sysTooltipChanInfoStyle",settings.sysTooltipChanInfoStyle);
   }
 
   // color
diff --git a/src/gui/sysManager.cpp b/src/gui/sysManager.cpp
index 845e32a87..b6bda6433 100644
--- a/src/gui/sysManager.cpp
+++ b/src/gui/sysManager.cpp
@@ -88,14 +88,14 @@ void FurnaceGUI::drawSysManager() {
           isNotCollapsed=false;
           ImGui::TreePop();
         }
-        if (ImGui::IsItemHovered(ImGuiHoveredFlags_Stationary) && isNotCollapsed && settings.chipManagerTooltip) {
+        if (ImGui::IsItemHovered(ImGuiHoveredFlags_Stationary) && isNotCollapsed) {
           if (e->song.system[i]!=DIV_SYSTEM_NULL) {
             const DivSysDef* sysDef=e->getSystemDef(e->song.system[i]);
             if (ImGui::BeginTooltip()) {
               ImGui::PushTextWrapPos(420.0f*dpiScale); // arbitrary constant
               ImGui::TextWrapped("%s",sysDef->description);
-              if (settings.sysTooltipChanInfoStyle&1) drawSystemChannelInfoText(sysDef);
-              if (settings.sysTooltipChanInfoStyle&2) drawSystemChannelInfo(sysDef);
+              drawSystemChannelInfoText(sysDef);
+              drawSystemChannelInfo(sysDef);
               ImGui::PopTextWrapPos();
               ImGui::EndTooltip();
             }
diff --git a/src/gui/sysMiscInfo.cpp b/src/gui/sysMiscInfo.cpp
index 75a115c55..4f8d9f500 100644
--- a/src/gui/sysMiscInfo.cpp
+++ b/src/gui/sysMiscInfo.cpp
@@ -300,7 +300,7 @@ void FurnaceGUI::drawSystemChannelInfo(const DivSysDef* whichDef) {
   float scaler=5.0f*dpiScale;
   float x=p.x+dpiScale;
   for (int i=0; i<whichDef->channels; i++) {
-    dl->AddRectFilled(ImVec2(x,p.y),ImVec2(x+2.0f*scaler,p.y+4.0f*scaler),ImGui::GetColorU32(uiColors[whichDef->chanTypes[i]+GUI_COLOR_CHANNEL_FM]),scaler);
+    dl->AddRectFilled(ImVec2(x,p.y),ImVec2(x+2.0f*scaler,p.y+1.0f*scaler),ImGui::GetColorU32(uiColors[whichDef->chanTypes[i]+GUI_COLOR_CHANNEL_FM]),scaler);
     x+=3.0f*scaler;
   }
   ImGui::Dummy(ImVec2(0,4*scaler));
diff --git a/src/gui/sysPicker.cpp b/src/gui/sysPicker.cpp
index b3fee8186..84cae29f9 100644
--- a/src/gui/sysPicker.cpp
+++ b/src/gui/sysPicker.cpp
@@ -92,8 +92,8 @@ DivSystem FurnaceGUI::systemPicker(bool fullWidth) {
     if (hoveredSys!=DIV_SYSTEM_NULL) {
       const DivSysDef* sysDef=e->getSystemDef(hoveredSys);
       ImGui::TextWrapped("%s",sysDef->description);
-      if (settings.sysTooltipChanInfoStyle&1) drawSystemChannelInfoText(sysDef);
-      if (settings.sysTooltipChanInfoStyle&2) drawSystemChannelInfo(sysDef);
+      drawSystemChannelInfoText(sysDef);
+      drawSystemChannelInfo(sysDef);
     }
   }
   ImGui::EndChild();