Skip to content

Commit

Permalink
Merge pull request #1509 from Eknous-P/settingdetect
Browse files Browse the repository at this point in the history
Settings change detect
  • Loading branch information
tildearrow authored Oct 5, 2023
2 parents 7736ced + 277a695 commit 82da85e
Show file tree
Hide file tree
Showing 3 changed files with 329 additions and 36 deletions.
5 changes: 5 additions & 0 deletions src/gui/gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5499,6 +5499,7 @@ bool FurnaceGUI::loop() {
reportError(fmt::sprintf("could NOT save layout! %s",strerror(errno)));
}
}
settingsChanged=true;
}
ImGui::SameLine();
if (ImGui::Button("No")) {
Expand All @@ -5509,6 +5510,7 @@ bool FurnaceGUI::loop() {
if (ImGui::Button("Yes")) {
ImGui::CloseCurrentPopup();
resetKeybinds();
settingsChanged=true;
}
ImGui::SameLine();
if (ImGui::Button("No")) {
Expand All @@ -5520,6 +5522,7 @@ bool FurnaceGUI::loop() {
ImGui::CloseCurrentPopup();
resetColors();
applyUISettings(false);
settingsChanged=true;
}
ImGui::SameLine();
if (ImGui::Button("No")) {
Expand All @@ -5531,12 +5534,14 @@ bool FurnaceGUI::loop() {
ImGui::CloseCurrentPopup();
settingsOpen=false;
willCommit=true;
settingsChanged=false;
}
ImGui::SameLine();
if (ImGui::Button("No")) {
ImGui::CloseCurrentPopup();
settingsOpen=false;
syncSettings();
settingsChanged=false;
}
ImGui::SameLine();
if (ImGui::Button("Cancel") || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
Expand Down
2 changes: 2 additions & 0 deletions src/gui/gui.h
Original file line number Diff line number Diff line change
Expand Up @@ -1436,6 +1436,7 @@ class FurnaceGUI {
char emptyLabel2[32];

struct Settings {
bool settingsChanged;
int mainFontSize, patFontSize, headFontSize, iconSize;
int audioEngine;
int audioQuality;
Expand Down Expand Up @@ -1618,6 +1619,7 @@ class FurnaceGUI {
DivConfig initialSys;

Settings():
settingsChanged(false),
mainFontSize(18),
patFontSize(18),
headFontSize(27),
Expand Down
Loading

0 comments on commit 82da85e

Please sign in to comment.