From 8aaced68d0b35f3e926c4385165161eea26d39ae Mon Sep 17 00:00:00 2001
From: zulianc <julien.chataigner@etu.univ-lyon1.fr>
Date: Sat, 22 Mar 2025 11:00:31 +0100
Subject: [PATCH] merging aftermath

---
 .vscode/c_cpp_properties.json      | 2 +-
 src/GraphicalUI/AppMenus/AppMenu.h | 2 +-
 src/GraphicalUI/Settings.cpp       | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 79b93da..f926128 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -1,7 +1,7 @@
 {
   "configurations": [
     {
-      "name": "JMinos",
+      "name": "jminos",
       "cppStandard": "c++20",
       "compileCommands": ".vscode/compile_commands.json"
     }
diff --git a/src/GraphicalUI/AppMenus/AppMenu.h b/src/GraphicalUI/AppMenus/AppMenu.h
index 9435faa..1302f87 100644
--- a/src/GraphicalUI/AppMenus/AppMenu.h
+++ b/src/GraphicalUI/AppMenus/AppMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Settings.h"
+#include "../Settings.h"
 
 #include <stack>
 #include <memory>
diff --git a/src/GraphicalUI/Settings.cpp b/src/GraphicalUI/Settings.cpp
index 7cb7c0c..4a0c31d 100644
--- a/src/GraphicalUI/Settings.cpp
+++ b/src/GraphicalUI/Settings.cpp
@@ -37,13 +37,17 @@ void Settings::resetSettingsFile() const {
 bool Settings::selectNextKeybinds() {
     if (this->chosenKeybinds < NUMBER_OF_KEYBINDS) {
         this->chosenKeybinds++;
+        return true;
     }
+    return false;
 }
 
 bool Settings::selectPreviousKeybinds() {
     if (this->chosenKeybinds > 0) {
         this->chosenKeybinds--;
+        return true;
     }
+    return false;
 }
 
 bool Settings::canModifyCurrentKeybinds() const {
@@ -57,13 +61,17 @@ void Settings::setGamemode(Gamemode gamemode) {
 bool Settings::widenWindow() {
     if (this->windowSizeMode < WINDOW_SIZE_LAST_MODE) {
         this->windowSizeMode++;
+        return true;
     }
+    return false;
 }
 
 bool Settings::shortenWindow() {
     if (this->windowSizeMode > 0) {
         this->windowSizeMode--;
+        return true;
     }
+    return false;
 }
 
 void Settings::selectPieces(PiecesType type, int value) {