Skip to content

Commit 87a89c2

Browse files
authored
fix on Input path
the Enter key was catched by key explore feature
1 parent e45fc98 commit 87a89c2

File tree

1 file changed

+28
-21
lines changed

1 file changed

+28
-21
lines changed

ImGuiFileDialog/ImGuiFileDialog.cpp

+28-21
Original file line numberDiff line numberDiff line change
@@ -900,11 +900,6 @@ namespace igfd
900900
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
901901
ImGui::InputText("##path", m_InputPathBuffer, 1023);
902902
ImGui::PopItemWidth();
903-
if (ImGui::IsKeyReleased(IGFD_KEY_ENTER))
904-
{
905-
SetPath(std::string(m_InputPathBuffer));
906-
m_InputPathActivated = false;
907-
}
908903
}
909904
else
910905
{
@@ -1088,28 +1083,40 @@ namespace igfd
10881083
}
10891084
}
10901085
#ifdef USE_IMGUI_TABLES
1091-
}
1092-
if (ImGui::TableSetColumnIndex(1)) // second column
1093-
{
1094-
if (infos.type != 'd')
1095-
{
1096-
ImGui::Text("%s ", infos.formatedFileSize.c_str()); //-V111
1097-
}
1098-
}
1099-
if (ImGui::TableSetColumnIndex(2)) // third column
1100-
{
1101-
ImGui::Text("%s", infos.fileModifDate.c_str()); //-V111
1102-
}
1086+
}
1087+
if (ImGui::TableSetColumnIndex(1)) // second column
1088+
{
1089+
if (infos.type != 'd')
1090+
{
1091+
ImGui::Text("%s ", infos.formatedFileSize.c_str()); //-V111
1092+
}
1093+
}
1094+
if (ImGui::TableSetColumnIndex(2)) // third column
1095+
{
1096+
ImGui::Text("%s", infos.fileModifDate.c_str()); //-V111
1097+
}
11031098
#endif
1104-
if (showColor)
1105-
ImGui::PopStyleColor();
1099+
if (showColor)
1100+
ImGui::PopStyleColor();
11061101

11071102
}
11081103
}
11091104
clipper.End();
1105+
1106+
if (m_InputPathActivated)
1107+
{
1108+
if (ImGui::IsKeyReleased(IGFD_KEY_ENTER))
1109+
{
1110+
SetPath(std::string(m_InputPathBuffer));
1111+
m_InputPathActivated = false;
1112+
}
1113+
}
11101114
#ifdef USE_EXPLORATION_BY_KEYS
1111-
LocateByInputKey();
1112-
ExploreWithkeys();
1115+
else
1116+
{
1117+
LocateByInputKey();
1118+
ExploreWithkeys();
1119+
}
11131120
#endif
11141121
#ifdef USE_IMGUI_TABLES
11151122
ImGui::EndTable();

0 commit comments

Comments
 (0)