otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

dialog nitpicks: more close-with-esc

Browse source
This commit is contained in:
YohananDiamond 2023-07-11 11:14:35 -03:00
parent 5fa2164ed5
commit f0e7be79d5
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gui/gui.cpp
View file

@ -5252,7 +5252,7 @@ bool FurnaceGUI::loop() {
quit=true; quit=true;
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Cancel")) { if (ImGui::Button("Cancel") || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
break; break;
@ -5276,7 +5276,7 @@ bool FurnaceGUI::loop() {
displayNew=true; displayNew=true;
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Cancel")) { if (ImGui::Button("Cancel") || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
break; break;
@ -5300,7 +5300,7 @@ bool FurnaceGUI::loop() {
openFileDialog(GUI_FILE_OPEN); openFileDialog(GUI_FILE_OPEN);
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Cancel")) { if (ImGui::Button("Cancel") || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
break; break;
@ -5324,7 +5324,7 @@ bool FurnaceGUI::loop() {
openFileDialog(GUI_FILE_OPEN_BACKUP); openFileDialog(GUI_FILE_OPEN_BACKUP);
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Cancel")) { if (ImGui::Button("Cancel") || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
break; break;
@ -5355,7 +5355,7 @@ bool FurnaceGUI::loop() {
nextFile=""; nextFile="";
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Cancel")) { if (ImGui::Button("Cancel") || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
nextFile=""; nextFile="";
} }
@ -5409,7 +5409,7 @@ bool FurnaceGUI::loop() {
syncSettings(); syncSettings();
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Cancel")) { if (ImGui::Button("Cancel") || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
break; break;
@ -5496,7 +5496,7 @@ bool FurnaceGUI::loop() {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
if (ImGui::Button("Wait! What am I doing? Cancel!")) { if (ImGui::Button("Wait! What am I doing? Cancel!") || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
break; break;
@ -5647,7 +5647,7 @@ bool FurnaceGUI::loop() {
ImGui::EndDisabled(); ImGui::EndDisabled();
ImGui::SameLine(); ImGui::SameLine();
} }
if (ImGui::Button("Cancel")) { if (ImGui::Button("Cancel") || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
for (std::pair<DivInstrument*,bool>& i: pendingIns) { for (std::pair<DivInstrument*,bool>& i: pendingIns) {
i.second=false; i.second=false;
} }
@ -5719,7 +5719,7 @@ bool FurnaceGUI::loop() {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Cancel")) { if (ImGui::Button("Cancel") || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
ImGui::EndPopup(); ImGui::EndPopup();