fix: fixed tracking variable buggy behavior

klonyyy · Nov 9, 2024 · 0b374bc · 0b374bc
1 parent e0ba38f
commit 0b374bc
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 19 deletions.
diff --git a/src/ConfigHandler/ConfigHandler.cpp b/src/ConfigHandler/ConfigHandler.cpp
@@ -41,6 +41,10 @@ void ConfigHandler::loadVariables(std::map<std::string, std::shared_ptr<Variable
 		if (trackedName.empty())
 			trackedName = name;
 		newVar->setTrackedName(trackedName);
+
+		if (trackedName != name)
+			newVar->setIsTrackedNameDifferent(true);
+
 		newVar->setAddress(atoi(ini->get(varFieldFromID(varId)).get("address").c_str()));
 		newVar->setType(static_cast<Variable::Type>(atoi(ini->get(varFieldFromID(varId)).get("type").c_str())));
 		newVar->setColor(static_cast<uint32_t>(atol(ini->get(varFieldFromID(varId)).get("color").c_str())));

diff --git a/src/Gui/GuiVariablesEdit.hpp b/src/Gui/GuiVariablesEdit.hpp
@@ -31,6 +31,7 @@ class VariableEditWindow
 			if (ImGui::Button("Done", ImVec2(-1, buttonHeight)))
 			{
 				showVariableEditWindow = false;
+				selection.clear();
 				ImGui::CloseCurrentPopup();
 			}
 
@@ -61,7 +62,7 @@ class VariableEditWindow
 		std::string shift = std::to_string(editedVariable->getShift());
 		std::string mask = std::string("0x") + std::string(GuiHelper::intToHexString(editedVariable->getMask()));
 		bool shouldUpdateFromElf = editedVariable->getShouldUpdateFromElf();
-		static bool selectNameManually = false;
+		bool selectNameManually = editedVariable->getIsTrackedNameDifferent();
 
 		ImGui::Dummy(ImVec2(-1, 5));
 		GuiHelper::drawCenteredText("Variable");
@@ -79,27 +80,28 @@ class VariableEditWindow
 
 		GuiHelper::drawTextAlignedToSize("specify tracked name:", alignment);
 		ImGui::SameLine();
-		ImGui::Checkbox("##selectNameManually", &selectNameManually);
+		if (ImGui::Checkbox("##selectNameManually", &selectNameManually))
+			editedVariable->setIsTrackedNameDifferent(selectNameManually);
 
-		if (selectNameManually)
-		{
-			GuiHelper::drawTextAlignedToSize("tracked variable:", alignment);
-			ImGui::SameLine();
+		ImGui::BeginDisabled(!selectNameManually);
 
-			std::string trackedVarName = selection.empty() ? editedVariable->getTrackedName() : *selection.begin();
+		GuiHelper::drawTextAlignedToSize("tracked variable:", alignment);
+		ImGui::SameLine();
 
-			if (ImGui::InputText("##trackedVarName", &trackedVarName, ImGuiInputTextFlags_None, NULL, NULL) || editedVariable->getTrackedName() != trackedVarName)
-			{
-				editedVariable->setTrackedName(trackedVarName);
-				editedVariable->setAddress(vars->at(trackedVarName)->getAddress());
-				editedVariable->setType(vars->at(trackedVarName)->getType());
-			}
-			ImGui::SameLine();
-			if (ImGui::Button("select...", ImVec2(65 * GuiHelper::contentScale, 19 * GuiHelper::contentScale)))
-				selectVariableWindow->setShowState(true);
+		std::string trackedVarName = selection.empty() ? editedVariable->getTrackedName() : *selection.begin();
+
+		if (ImGui::InputText("##trackedVarName", &trackedVarName, ImGuiInputTextFlags_None, NULL, NULL) || editedVariable->getTrackedName() != trackedVarName)
+		{
+			editedVariable->setTrackedName(trackedVarName);
+			editedVariable->setAddress(vars->at(trackedVarName)->getAddress());
+			editedVariable->setType(vars->at(trackedVarName)->getType());
+			selection.clear();
 		}
-		else
-			editedVariable->setTrackedName(name);
+		ImGui::SameLine();
+		if (ImGui::Button("select...", ImVec2(65 * GuiHelper::contentScale, 19 * GuiHelper::contentScale)))
+			selectVariableWindow->setShowState(true);
+
+		ImGui::EndDisabled();
 
 		GuiHelper::drawTextAlignedToSize("update from *.elf:", alignment);
 		ImGui::SameLine();

diff --git a/src/Variable/Variable.cpp b/src/Variable/Variable.cpp
@@ -76,6 +76,9 @@ void Variable::rename(const std::string& newName)
 	if (renameCallback)
 		renameCallback(name, newName);
 	name = newName;
+
+	if (!isTrackedNameDifferent)
+		trackedName = newName;
 }
 
 void Variable::setColor(float r, float g, float b, float a)
@@ -226,6 +229,16 @@ void Variable::setShouldUpdateFromElf(bool shouldUpdateFromElf)
 	this->shouldUpdateFromElf = shouldUpdateFromElf;
 }
 
+bool Variable::getIsTrackedNameDifferent() const
+{
+	return isTrackedNameDifferent;
+}
+
+void Variable::setIsTrackedNameDifferent(bool isDifferent)
+{
+	this->isTrackedNameDifferent = isDifferent;
+}
+
 std::string Variable::getTrackedName() const
 {
 	return trackedName;

diff --git a/src/Variable/Variable.hpp b/src/Variable/Variable.hpp
@@ -71,6 +71,9 @@ class Variable
 	bool getShouldUpdateFromElf() const;
 	void setShouldUpdateFromElf(bool shouldUpdateFromElf);
 
+	bool getIsTrackedNameDifferent() const;
+	void setIsTrackedNameDifferent(bool isDifferent);
+
 	std::string getTrackedName() const;
 	void setTrackedName(const std::string& trackedName);
 
@@ -95,7 +98,6 @@ class Variable
 	std::function<void(const std::string&, const std::string&)> renameCallback;
 
    private:
-
 	std::string name = "";
 	std::string trackedName = "";
 	Type type = Type::UNKNOWN;
@@ -113,6 +115,7 @@ class Variable
 	Color color{};
 	bool isFound = false;
 	bool shouldUpdateFromElf = true;
+	bool isTrackedNameDifferent = false;
 };
 
 #endif