Merge pull request #1422 from Eknous-P/guimprove

Numerous GUI improvements

src/gui/chanOsc.cpp

@@ -282,10 +282,12 @@ void FurnaceGUI::drawChanOsc() {
                   updateChanOscGradTex=true;
                 }
 
+                pushDestColor();
                 if (ImGui::Button("Remove")) {
                   removePoint=index;
                   ImGui::CloseCurrentPopup();
                 }
+                popDestColor();
 
                 ImGui::EndPopup();
               }

src/gui/dataList.cpp

@@ -172,10 +172,12 @@ void FurnaceGUI::waveListItem(int i, float* wavePreview, int dir, int asset) {
     wavePreview[i]=wave->data[i];
   }
   if (wave->len>0) wavePreview[wave->len]=wave->data[wave->len-1];
-  if (ImGui::Selectable(fmt::sprintf("%d##_WAVE%d\n",i,i).c_str(),curWave==i)) {
+  ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, ImVec2(0,0.5f));
+  if (ImGui::Selectable(fmt::sprintf(" %d##_WAVE%d\n",i,i).c_str(),curWave==i,0,ImVec2(0,23*dpiScale))) { // i didnt think that the 0 would work, but it does
     curWave=i;
     lastAssetType=1;
   }
+  ImGui::PopStyleVar();
   if (wantScrollList && curWave==i) ImGui::SetScrollHereY();
   if (ImGui::IsItemHovered()) {
     if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) {

src/gui/findReplace.cpp

@@ -811,9 +811,14 @@ void FurnaceGUI::drawFindReplace() {
               }
               ImGui::TableNextRow();
               ImGui::TableNextColumn();
+              pushDestColor();
               if (ImGui::Button(ICON_FA_MINUS "##DelQuery")) {
                 eraseIndex=index;
               }
+              popDestColor();
+              if (ImGui::IsItemHovered()) {
+                ImGui::SetTooltip("Delete query");
+              }
               ImGui::TableNextColumn();
               if (i.effectCount<8) {
                 if (ImGui::Button("Add effect")) {
@@ -822,9 +827,11 @@ void FurnaceGUI::drawFindReplace() {
               }
               ImGui::TableNextColumn();
               if (i.effectCount>0) {
+                pushDestColor();
                 if (ImGui::Button("Remove effect")) {
                   i.effectCount--;
                 }
+                popDestColor();
               }
               ImGui::EndTable();
             }
@@ -1103,9 +1110,11 @@ void FurnaceGUI::drawFindReplace() {
           }
           ImGui::TableNextColumn();
           if (queryReplaceEffectCount>0) {
+            pushDestColor();
             if (ImGui::Button("Remove effect")) {
               queryReplaceEffectCount--;
             }
+            popDestColor();
           }
 
           ImGui::EndTable();

src/gui/grooves.cpp

@@ -47,13 +47,14 @@ void FurnaceGUI::drawGrooves() {
       ImGui::TableNextColumn();
       ImGui::Text("pattern");
       ImGui::TableNextColumn();
-      ImGui::Text("remove");
+      // ImGui::Text("remove"); removed because the text clips from the fixed width
 
       int index=0;
       for (DivGroovePattern& i: e->song.grooves) {
         ImGui::TableNextRow();
         ImGui::TableNextColumn();
         ImGui::PushFont(patFont);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text("%.2X",index);
         ImGui::PopFont();
 
@@ -79,6 +80,7 @@ void FurnaceGUI::drawGrooves() {
             ImGui::SetKeyboardFocusHere();
           }
           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+          ImGui::AlignTextToFramePadding();
           if (ImGui::InputText(grooveStr.c_str(),&grooveListString)) {
             decodeMMLStr(grooveListString,intVersion,intVersionLen,ignoredLoop,1,255,ignoredRel);
             if (intVersionLen<1) {
@@ -120,10 +122,15 @@ void FurnaceGUI::drawGrooves() {
         }
 
         ImGui::TableNextColumn();
+        pushDestColor();
         String grooveID=fmt::sprintf(ICON_FA_TIMES "##GRR%d",index);
         if (ImGui::Button(grooveID.c_str())) {
           delGroove=index;
         }
+        popDestColor();
+        if (ImGui::IsItemHovered()) {
+          ImGui::SetTooltip("remove");
+        }
 
         index++;
       }

src/gui/insEdit.cpp

@@ -4333,6 +4333,7 @@ void FurnaceGUI::drawInsEdit() {
                   MARK_MODIFIED;
                 }
                 ImGui::SameLine();
+                pushDestColor();
                 if (ImGui::Button(ICON_FA_TIMES "##HWCmdDel")) {
                   for (int j=i; j<ins->gb.hwSeqLen-1; j++) {
                     ins->gb.hwSeq[j].cmd=ins->gb.hwSeq[j+1].cmd;
@@ -4340,6 +4341,7 @@ void FurnaceGUI::drawInsEdit() {
                   }
                   ins->gb.hwSeqLen--;
                 }
+                popDestColor();
                 ImGui::PopID();
               }
               ImGui::EndTable();

src/gui/orders.cpp

@@ -115,10 +115,12 @@ void FurnaceGUI::drawOrderButtons() {
   }
   NEXT_BUTTON;
 
+  pushDestColor();
   if (ImGui::Button(ICON_FA_MINUS)) { handleUnimportant
     // remove this order row
     doAction(GUI_ACTION_ORDERS_REMOVE);
   }
+  popDestColor();
   if (ImGui::IsItemHovered()) {
     ImGui::SetTooltip("Remove order");
   } 

src/gui/settings.cpp

@@ -577,7 +577,7 @@ void FurnaceGUI::drawSettings() {
           float vol=fabs(sysVol);
           ImGui::PushID(i);
 
-          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-ImGui::CalcTextSize("Invert").x-ImGui::GetFrameHeightWithSpacing()*2.0-ImGui::GetStyle().ItemSpacing.x);
+          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-ImGui::CalcTextSize("Invert").x-ImGui::GetFrameHeightWithSpacing()*2.0-ImGui::GetStyle().ItemSpacing.x*2.0);
           if (ImGui::BeginCombo("##System",getSystemName(sysID))) {
             for (int j=0; availableSystems[j]; j++) {
               if (ImGui::Selectable(getSystemName((DivSystem)availableSystems[j]),sysID==availableSystems[j])) {
@@ -596,11 +596,13 @@ void FurnaceGUI::drawSettings() {
           }
           ImGui::SameLine();
           //ImGui::BeginDisabled(settings.initialSys.size()<=4);
+          pushDestColor();
           if (ImGui::Button(ICON_FA_MINUS "##InitSysRemove")) {
             doRemove=i;
           }
+          popDestColor();
           //ImGui::EndDisabled();
-          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-ImGui::GetFrameHeightWithSpacing()*2.0-ImGui::GetStyle().ItemSpacing.x*2.0);
           if (CWSliderFloat("Volume",&vol,0.0f,3.0f)) {
             if (doInvert) {
               if (vol<0.0001) vol=0.0001;
@@ -610,13 +612,13 @@ void FurnaceGUI::drawSettings() {
             sysVol=doInvert?-vol:vol;
             settings.initialSys.set(fmt::sprintf("vol%d",i),(float)sysVol);
           } rightClickable
-          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-ImGui::GetFrameHeightWithSpacing()*2.0-ImGui::GetStyle().ItemSpacing.x*2.0);
           if (CWSliderFloat("Panning",&sysPan,-1.0f,1.0f)) {
             if (sysPan<-1.0f) sysPan=-1.0f;
             if (sysPan>1.0f) sysPan=1.0f;
             settings.initialSys.set(fmt::sprintf("pan%d",i),(float)sysPan);
           } rightClickable
-          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-ImGui::GetFrameHeightWithSpacing()*2.0-ImGui::GetStyle().ItemSpacing.x*2.0);
           if (CWSliderFloat("Front/Rear",&sysPanFR,-1.0f,1.0f)) {
             if (sysPanFR<-1.0f) sysPanFR=-1.0f;
             if (sysPanFR>1.0f) sysPanFR=1.0f;
@@ -719,10 +721,15 @@ void FurnaceGUI::drawSettings() {
       CONFIG_SECTION("Audio") {
         // SUBSECTION OUTPUT
         CONFIG_SUBSECTION("Output");
+        if (ImGui::BeginTable("##Output",2)) {
+          ImGui::TableSetupColumn("##Label",ImGuiTableColumnFlags_WidthFixed);
+          ImGui::TableSetupColumn("##Combo",ImGuiTableColumnFlags_WidthStretch);
 #ifdef HAVE_JACK
+          ImGui::TableNextRow();
+          ImGui::TableNextColumn();
           ImGui::AlignTextToFramePadding();
           ImGui::Text("Backend");
-        ImGui::SameLine();
+          ImGui::TableNextColumn();
           int prevAudioEngine=settings.audioEngine;
           if (ImGui::Combo("##Backend",&settings.audioEngine,audioBackends,2)) {
             if (settings.audioEngine!=prevAudioEngine) {
@@ -732,9 +739,11 @@ void FurnaceGUI::drawSettings() {
 #endif
 
           if (settings.audioEngine==DIV_AUDIO_SDL) {
+            ImGui::TableNextRow();
+            ImGui::TableNextColumn();
             ImGui::AlignTextToFramePadding();
             ImGui::Text("Driver");
-          ImGui::SameLine();
+            ImGui::TableNextColumn();
             if (ImGui::BeginCombo("##SDLADriver",settings.sdlAudioDriver.empty()?"Automatic":settings.sdlAudioDriver.c_str())) {
               if (ImGui::Selectable("Automatic",settings.sdlAudioDriver.empty())) {
                 settings.sdlAudioDriver="";
@@ -751,9 +760,11 @@ void FurnaceGUI::drawSettings() {
             }
           }
 
+          ImGui::TableNextRow();
+          ImGui::TableNextColumn();
           ImGui::AlignTextToFramePadding();
           ImGui::Text("Device");
-        ImGui::SameLine();
+          ImGui::TableNextColumn();
           String audioDevName=settings.audioDevice.empty()?"<System default>":settings.audioDevice;
           if (ImGui::BeginCombo("##AudioDevice",audioDevName.c_str())) {
             if (ImGui::Selectable("<System default>",settings.audioDevice.empty())) {
@@ -767,9 +778,11 @@ void FurnaceGUI::drawSettings() {
             ImGui::EndCombo();
           }
 
+          ImGui::TableNextRow();
+          ImGui::TableNextColumn();
           ImGui::AlignTextToFramePadding();
           ImGui::Text("Sample rate");
-        ImGui::SameLine();
+          ImGui::TableNextColumn();
           String sr=fmt::sprintf("%d",settings.audioRate);
           if (ImGui::BeginCombo("##SampleRate",sr.c_str())) {
             SAMPLE_RATE_SELECTABLE(8000);
@@ -784,9 +797,12 @@ void FurnaceGUI::drawSettings() {
             ImGui::EndCombo();
           }
 
+          ImGui::TableNextRow();
+          ImGui::TableNextColumn();
           if (isProAudio[settings.audioEngine]) {
+            ImGui::AlignTextToFramePadding();
             ImGui::Text("Outputs");
-          ImGui::SameLine();
+            ImGui::TableNextColumn();
             if (ImGui::InputInt("##AudioChansI",&settings.audioChans,1,1)) {
               if (settings.audioChans<1) settings.audioChans=1;
               if (settings.audioChans>16) settings.audioChans=16;
@@ -794,7 +810,7 @@ void FurnaceGUI::drawSettings() {
           } else {
             ImGui::AlignTextToFramePadding();
             ImGui::Text("Channels");
-          ImGui::SameLine();
+            ImGui::TableNextColumn();
             String chStr=(settings.audioChans<1 || settings.audioChans>8)?"What?":nonProAudioOuts[settings.audioChans-1];
             if (ImGui::BeginCombo("##AudioChans",chStr.c_str())) {
               CHANS_SELECTABLE(1);
@@ -806,9 +822,11 @@ void FurnaceGUI::drawSettings() {
             }
           }
 
+          ImGui::TableNextRow();
+          ImGui::TableNextColumn();
           ImGui::AlignTextToFramePadding();
           ImGui::Text("Buffer size");
-        ImGui::SameLine();
+          ImGui::TableNextColumn();
           String bs=fmt::sprintf("%d (latency: ~%.1fms)",settings.audioBufSize,2000.0*(double)settings.audioBufSize/(double)MAX(1,settings.audioRate));
           if (ImGui::BeginCombo("##BufferSize",bs.c_str())) {
             BUFFER_SIZE_SELECTABLE(64);
@@ -819,6 +837,8 @@ void FurnaceGUI::drawSettings() {
             BUFFER_SIZE_SELECTABLE(2048);
             ImGui::EndCombo();
           }
+          ImGui::EndTable();
+        }
 
         bool lowLatencyB=settings.lowLatency;
         if (ImGui::Checkbox("Low-latency mode (experimental!)",&lowLatencyB)) {
@@ -2015,11 +2035,15 @@ void FurnaceGUI::drawSettings() {
 
         // SUBSECTION TEXT
         CONFIG_SUBSECTION("Text");
+        if (ImGui::BeginTable("##Text",2)) {
+          ImGui::TableSetupColumn("##Label",ImGuiTableColumnFlags_WidthFixed);
+          ImGui::TableSetupColumn("##Combos",ImGuiTableColumnFlags_WidthStretch);
+          ImGui::TableNextRow();
+          ImGui::TableNextColumn();
           ImGui::AlignTextToFramePadding();
           ImGui::Text("Main font");
-        ImGui::SameLine();
+          ImGui::TableNextColumn();
           ImGui::Combo("##MainFont",&settings.mainFont,mainFonts,7);
-        ImGui::Indent();
           if (settings.mainFont==6) {
             ImGui::InputText("##MainFontPath",&settings.mainFontPath);
             ImGui::SameLine();
@@ -2031,12 +2055,12 @@ void FurnaceGUI::drawSettings() {
             if (settings.mainFontSize<3) settings.mainFontSize=3;
             if (settings.mainFontSize>96) settings.mainFontSize=96;
           }
-        ImGui::Unindent();
+          ImGui::TableNextRow();
+          ImGui::TableNextColumn();
           ImGui::AlignTextToFramePadding();
           ImGui::Text("Header font");
-        ImGui::SameLine();
+          ImGui::TableNextColumn();
           ImGui::Combo("##HeadFont",&settings.headFont,headFonts,7);
-        ImGui::Indent();
           if (settings.headFont==6) {
             ImGui::InputText("##HeadFontPath",&settings.headFontPath);
             ImGui::SameLine();
@@ -2048,12 +2072,12 @@ void FurnaceGUI::drawSettings() {
             if (settings.headFontSize<3) settings.headFontSize=3;
             if (settings.headFontSize>96) settings.headFontSize=96;
           }
-        ImGui::Unindent();
+          ImGui::TableNextRow();
+          ImGui::TableNextColumn();
           ImGui::AlignTextToFramePadding();
           ImGui::Text("Pattern font");
-        ImGui::SameLine();
+          ImGui::TableNextColumn();
           ImGui::Combo("##PatFont",&settings.patFont,patFonts,7);
-        ImGui::Indent();
           if (settings.patFont==6) {
             ImGui::InputText("##PatFontPath",&settings.patFontPath);
             ImGui::SameLine();
@@ -2065,7 +2089,8 @@ void FurnaceGUI::drawSettings() {
             if (settings.patFontSize<3) settings.patFontSize=3;
             if (settings.patFontSize>96) settings.patFontSize=96;
           }
-        ImGui::Unindent();
+          ImGui::EndTable();
+        }
 
         bool loadJapaneseB=settings.loadJapanese;
         if (ImGui::Checkbox("Display Japanese characters",&loadJapaneseB)) {

src/gui/sysManager.cpp

@@ -102,10 +102,12 @@ void FurnaceGUI::drawSysManager() {
         }
         ImGui::SameLine();
         ImGui::BeginDisabled(e->song.systemLen<=1);
+        pushDestColor();
         if (ImGui::Button(ICON_FA_TIMES "##SysRemove")) {
           sysToDelete=i;
           showWarning("Are you sure you want to remove this chip?",GUI_WARN_SYSTEM_DEL);
         }
+        popDestColor();
         if (ImGui::IsItemHovered()) {
           ImGui::SetTooltip("Remove");
         }