From fdd9b598a722d04ebda731a60ba7882221704f38 Mon Sep 17 00:00:00 2001 From: Eknous-P Date: Sun, 27 Aug 2023 10:15:28 +0400 Subject: [PATCH] revert additive hint --- src/gui/dataList.cpp | 6 ------ src/gui/findReplace.cpp | 4 ---- src/gui/grooves.cpp | 2 -- src/gui/gui.h | 3 --- src/gui/guiConst.cpp | 1 - src/gui/insEdit.cpp | 2 -- src/gui/orders.cpp | 2 -- src/gui/settings.cpp | 13 ------------- src/gui/subSongs.cpp | 2 -- src/gui/sysManager.cpp | 2 -- 10 files changed, 37 deletions(-) diff --git a/src/gui/dataList.cpp b/src/gui/dataList.cpp index e4607050..86de5a03 100644 --- a/src/gui/dataList.cpp +++ b/src/gui/dataList.cpp @@ -253,7 +253,6 @@ void FurnaceGUI::drawInsList(bool asChild) { } if (began) { if (settings.unifiedDataView) settings.horizontalDataView=0; - pushAddColor(); if (ImGui::Button(ICON_FA_PLUS "##InsAdd")) { if (settings.unifiedDataView) { switch (lastAssetType) { @@ -271,7 +270,6 @@ void FurnaceGUI::drawInsList(bool asChild) { doAction(GUI_ACTION_INS_LIST_ADD); } } - popAddColor(); if (ImGui::IsItemHovered()) { ImGui::SetTooltip("Add"); } @@ -659,11 +657,9 @@ void FurnaceGUI::drawWaveList(bool asChild) { began=ImGui::Begin("Wavetables",&waveListOpen,globalWinFlags); } if (began) { - pushAddColor(); if (ImGui::Button(ICON_FA_PLUS "##WaveAdd")) { doAction(GUI_ACTION_WAVE_LIST_ADD); } - popAddColor(); if (ImGui::IsItemHovered()) { ImGui::SetTooltip("Add"); } @@ -793,11 +789,9 @@ void FurnaceGUI::drawSampleList(bool asChild) { began=ImGui::Begin("Samples",&sampleListOpen,globalWinFlags); } if (began) { - pushAddColor(); if (ImGui::Button(ICON_FA_FILE "##SampleAdd")) { doAction(GUI_ACTION_SAMPLE_LIST_ADD); } - popAddColor(); if (ImGui::IsItemHovered()) { ImGui::SetTooltip("Add"); } diff --git a/src/gui/findReplace.cpp b/src/gui/findReplace.cpp index 0e313d0a..b2dcc0c1 100644 --- a/src/gui/findReplace.cpp +++ b/src/gui/findReplace.cpp @@ -821,11 +821,9 @@ void FurnaceGUI::drawFindReplace() { } ImGui::TableNextColumn(); if (i.effectCount<8) { - pushAddColor(); if (ImGui::Button("Add effect")) { i.effectCount++; } - popAddColor(); } ImGui::TableNextColumn(); if (i.effectCount>0) { @@ -1106,11 +1104,9 @@ void FurnaceGUI::drawFindReplace() { ImGui::TableNextColumn(); ImGui::TableNextColumn(); if (queryReplaceEffectCount<8) { - pushAddColor(); if (ImGui::Button("Add effect")) { queryReplaceEffectCount++; } - popAddColor(); } ImGui::TableNextColumn(); if (queryReplaceEffectCount>0) { diff --git a/src/gui/grooves.cpp b/src/gui/grooves.cpp index 4c739785..db709ce0 100644 --- a/src/gui/grooves.cpp +++ b/src/gui/grooves.cpp @@ -145,14 +145,12 @@ void FurnaceGUI::drawGrooves() { MARK_MODIFIED; } - pushAddColor(); if (ImGui::Button(ICON_FA_PLUS "##AddGroove")) { e->lockEngine([this]() { e->song.grooves.push_back(DivGroovePattern()); }); MARK_MODIFIED; } - popAddColor(); } if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) { curWindow=GUI_WINDOW_GROOVES; diff --git a/src/gui/gui.h b/src/gui/gui.h index 74f55a6d..9f6b04b2 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -130,7 +130,6 @@ enum FurnaceGUIColors { GUI_COLOR_TOGGLE_ON, GUI_COLOR_EDITING, GUI_COLOR_SONG_LOOP, - GUI_COLOR_ADDITIVE, GUI_COLOR_DESTRUCTIVE, GUI_COLOR_WARNING, GUI_COLOR_ERROR, @@ -2181,8 +2180,6 @@ class FurnaceGUI { void pushDestColor(); void popDestColor(); - void pushAddColor(); - void popAddColor(); void pushWarningColor(bool warnCond, bool errorCond=false); void popWarningColor(); diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp index 65966bb7..bc9f5ff7 100644 --- a/src/gui/guiConst.cpp +++ b/src/gui/guiConst.cpp @@ -810,7 +810,6 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={ D(GUI_COLOR_TOGGLE_ON,"",ImVec4(0.2f,0.6f,0.2f,1.0f)), D(GUI_COLOR_EDITING,"",ImVec4(0.2f,0.1f,0.1f,1.0f)), D(GUI_COLOR_SONG_LOOP,"",ImVec4(0.3f,0.5f,0.8f,0.4f)), - D(GUI_COLOR_ADDITIVE,"",ImVec4(0.2f,1.0f,0.2f,1.0f)), D(GUI_COLOR_DESTRUCTIVE,"",ImVec4(1.0f,0.2f,0.2f,1.0f)), D(GUI_COLOR_WARNING,"",ImVec4(0.98f,0.98f,0.06f,1.0f)), D(GUI_COLOR_ERROR,"",ImVec4(0.98f,0.06f,0.11f,1.0f)), diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index e7b9690a..f6066d68 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -4347,7 +4347,6 @@ void FurnaceGUI::drawInsEdit() { ImGui::EndTable(); } - pushAddColor(); if (ImGui::Button(ICON_FA_PLUS "##HWCmdAdd")) { if (ins->gb.hwSeqLen<255) { ins->gb.hwSeq[ins->gb.hwSeqLen].cmd=0; @@ -4355,7 +4354,6 @@ void FurnaceGUI::drawInsEdit() { ins->gb.hwSeqLen++; } } - popAddColor(); } ImGui::EndChild(); ImGui::EndDisabled(); diff --git a/src/gui/orders.cpp b/src/gui/orders.cpp index 4162b022..0bce014a 100644 --- a/src/gui/orders.cpp +++ b/src/gui/orders.cpp @@ -106,12 +106,10 @@ void FurnaceGUI::drawOrderButtons() { buttonColumns++; } - pushAddColor(); if (ImGui::Button(ICON_FA_PLUS)) { handleUnimportant // add order row (new) doAction(GUI_ACTION_ORDERS_ADD); } - popAddColor(); if (ImGui::IsItemHovered()) { ImGui::SetTooltip("Add new order"); } diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 0b53f77e..8b09ac96 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -659,7 +659,6 @@ void FurnaceGUI::drawSettings() { settings.initialSys.remove(fmt::sprintf("flags%d",sysCount-1)); } - pushAddColor(); if (sysCount<32) if (ImGui::Button(ICON_FA_PLUS "##InitSysAdd")) { settings.initialSys.set(fmt::sprintf("id%d",sysCount),(int)e->systemToFileFur(DIV_SYSTEM_YM2612)); settings.initialSys.set(fmt::sprintf("vol%d",sysCount),1.0f); @@ -667,7 +666,6 @@ void FurnaceGUI::drawSettings() { settings.initialSys.set(fmt::sprintf("fr%d",sysCount),0.0f); settings.initialSys.set(fmt::sprintf("flags%d",sysCount),""); } - popAddColor(); ImGui::Text("When creating new song:"); ImGui::Indent(); @@ -980,11 +978,9 @@ void FurnaceGUI::drawSettings() { ImGui::AlignTextToFramePadding(); ImGui::Text("Actions:"); ImGui::SameLine(); - pushAddColor(); if (ImGui::Button(ICON_FA_PLUS "##AddAction")) { midiMap.binds.push_back(MIDIBind()); } - popAddColor(); ImGui::SameLine(); if (ImGui::Button(ICON_FA_EXTERNAL_LINK "##AddLearnAction")) { midiMap.binds.push_back(MIDIBind()); @@ -2677,7 +2673,6 @@ void FurnaceGUI::drawSettings() { UI_COLOR_CONFIG(GUI_COLOR_EDITING,"Editing"); UI_COLOR_CONFIG(GUI_COLOR_SONG_LOOP,"Song loop"); UI_COLOR_CONFIG(GUI_COLOR_PLAYBACK_STAT,"Playback status"); - UI_COLOR_CONFIG(GUI_COLOR_ADDITIVE,"Additive hint"); UI_COLOR_CONFIG(GUI_COLOR_DESTRUCTIVE,"Destructive hint"); UI_COLOR_CONFIG(GUI_COLOR_WARNING,"Warning hint"); UI_COLOR_CONFIG(GUI_COLOR_ERROR,"Error hint"); @@ -3996,14 +3991,6 @@ void FurnaceGUI::popDestColor() { popAccentColors(); } -void FurnaceGUI::pushAddColor() { - pushAccentColors(uiColors[GUI_COLOR_ADDITIVE],uiColors[GUI_COLOR_ADDITIVE],uiColors[GUI_COLOR_ADDITIVE],ImVec4(0.0f,0.0f,0.0f,0.0f)); -} - -void FurnaceGUI::popAddColor() { - popAccentColors(); -} - void FurnaceGUI::pushWarningColor(bool warnCond, bool errorCond) { if (warnColorPushed) { logE("warnColorPushed"); diff --git a/src/gui/subSongs.cpp b/src/gui/subSongs.cpp index 86c606b6..15b107ed 100644 --- a/src/gui/subSongs.cpp +++ b/src/gui/subSongs.cpp @@ -70,7 +70,6 @@ void FurnaceGUI::drawSubSongs(bool asChild) { ImGui::EndCombo(); } ImGui::SameLine(); - pushAddColor(); if (ImGui::Button(ICON_FA_PLUS "##SubSongAdd")) { if (!e->addSubSong()) { showError("too many subsongs!"); @@ -89,7 +88,6 @@ void FurnaceGUI::drawSubSongs(bool asChild) { MARK_MODIFIED; } } - popAddColor(); if (ImGui::IsItemHovered()) { ImGui::SetTooltip("Add"); } diff --git a/src/gui/sysManager.cpp b/src/gui/sysManager.cpp index 6bbeea40..24dfdbfd 100644 --- a/src/gui/sysManager.cpp +++ b/src/gui/sysManager.cpp @@ -118,7 +118,6 @@ void FurnaceGUI::drawSysManager() { ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::TableNextColumn(); - pushAddColor(); ImGui::Button(ICON_FA_PLUS "##SysAdd"); if (ImGui::BeginPopupContextItem("SysPickerA",ImGuiPopupFlags_MouseButtonLeft)) { DivSystem picked=systemPicker(); @@ -136,7 +135,6 @@ void FurnaceGUI::drawSysManager() { } ImGui::EndPopup(); } - popAddColor(); } ImGui::EndTable(); }