From 7f0dc576d871e2e2e36240c2ba9dcc06e3fbe186 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sun, 11 Jun 2023 18:20:07 -0500 Subject: [PATCH] GUI: possibly fix asset name carry-over issue issue #1155 --- src/gui/insEdit.cpp | 2 ++ src/gui/intro.cpp | 1 + src/gui/sampleEdit.cpp | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index e02f3969..ca254d2c 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -2262,9 +2262,11 @@ void FurnaceGUI::drawInsEdit() { ImGui::TableNextColumn(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); + ImGui::PushID(2+curIns); if (ImGui::InputText("##Name",&ins->name)) { MARK_MODIFIED; } + ImGui::PopID(); ImGui::TableNextRow(); ImGui::TableNextColumn(); diff --git a/src/gui/intro.cpp b/src/gui/intro.cpp index db886316..42d36957 100644 --- a/src/gui/intro.cpp +++ b/src/gui/intro.cpp @@ -95,6 +95,7 @@ void FurnaceGUI::endIntroTune() { selEnd=SelectionPoint(); cursor=SelectionPoint(); updateWindowTitle(); + updateScroll(0); } void FurnaceGUI::drawIntro(double introTime, bool monitor) { diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp index 238f37e8..8f5a9843 100644 --- a/src/gui/sampleEdit.cpp +++ b/src/gui/sampleEdit.cpp @@ -158,9 +158,11 @@ void FurnaceGUI::drawSampleEdit() { ImGui::Text("Name"); ImGui::SameLine(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); + ImGui::PushID(2+curSample); if (ImGui::InputText("##SampleName",&sample->name)) { MARK_MODIFIED; } + ImGui::PopID(); ImGui::Separator();