Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-06 14:14:22 +01:00
Code Releases Wiki Activity

impr: Allow more popups to be closed with Escape

Browse Source
This commit is contained in:
WerWolv 2023-12-13 15:08:27 +01:00
parent 92043a3d23
commit 346f1362c6
10 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libimhex/include/hex/ui/view.hpp
View File

@ -176,6 +176,9 @@ namespace hex {
ImGui::EndPopup(); ImGui::EndPopup();
} }
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
this->getWindowOpenState() = false;
} }
} }
}; };

3
plugins/builtin/include/content/popups/popup_docs_question.hpp
View File

@ -68,6 +68,9 @@ namespace hex::plugin::builtin {
} }
} }
ImGui::EndChild(); ImGui::EndChild();
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
this->close();
} }
[[nodiscard]] ImGuiWindowFlags getFlags() const override { [[nodiscard]] ImGuiWindowFlags getFlags() const override {

3
plugins/builtin/include/content/popups/popup_file_chooser.hpp
View File

@ -87,6 +87,9 @@ namespace hex::plugin::builtin {
Popup::close(); Popup::close();
}, {}, this->m_multiple); }, {}, this->m_multiple);
} }
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
this->close();
} }
[[nodiscard]] ImGuiWindowFlags getFlags() const override { [[nodiscard]] ImGuiWindowFlags getFlags() const override {

3
plugins/builtin/include/content/popups/popup_notification.hpp
View File

@ -27,6 +27,9 @@ namespace hex::plugin::builtin {
this->m_function(); this->m_function();
ImGui::SetWindowPos((ImHexApi::System::getMainWindowSize() - ImGui::GetWindowSize()) / 2, ImGuiCond_Appearing); ImGui::SetWindowPos((ImHexApi::System::getMainWindowSize() - ImGui::GetWindowSize()) / 2, ImGuiCond_Appearing);
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
this->close();
} }
[[nodiscard]] ImGuiWindowFlags getFlags() const override { [[nodiscard]] ImGuiWindowFlags getFlags() const override {

2
plugins/builtin/include/content/popups/popup_unsaved_changes.hpp
View File

@ -40,7 +40,7 @@ namespace hex::plugin::builtin {
} }
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetCursorPosX(width / 9 * 5); ImGui::SetCursorPosX(width / 9 * 5);
if (ImGui::Button("hex.builtin.common.no"_lang, ImVec2(width / 3, 0))) { if (ImGui::Button("hex.builtin.common.no"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
this->m_noFunction(); this->m_noFunction();
this->close(); this->close();
} }

2
plugins/builtin/include/content/views/view_pattern_editor.hpp
View File

@ -92,7 +92,7 @@ namespace hex::plugin::builtin {
} }
); );
if (ImGui::IsKeyPressed(ImGuiKey_Escape)) if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
this->close(); this->close();
} }

3
plugins/builtin/source/content/recent.cpp
View File

@ -65,6 +65,9 @@ namespace hex::plugin::builtin::recent {
ImGui::EndTable(); ImGui::EndTable();
} }
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
this->close();
} }
[[nodiscard]] ImGuiWindowFlags getFlags() const override { [[nodiscard]] ImGuiWindowFlags getFlags() const override {

3
plugins/builtin/source/content/views/view_hashes.cpp
View File

@ -36,6 +36,9 @@ namespace hex::plugin::builtin {
ImGui::NewLine(); ImGui::NewLine();
ImGui::InputText("##result", this->m_result, ImGuiInputTextFlags_ReadOnly); ImGui::InputText("##result", this->m_result, ImGuiInputTextFlags_ReadOnly);
ImGui::PopItemWidth(); ImGui::PopItemWidth();
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
this->close();
} }
[[nodiscard]] ImGuiWindowFlags getFlags() const override { [[nodiscard]] ImGuiWindowFlags getFlags() const override {

4
plugins/builtin/source/content/welcome_screen.cpp
View File

@ -106,7 +106,7 @@ namespace hex::plugin::builtin {
} }
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetCursorPosX(width / 9 * 5); ImGui::SetCursorPosX(width / 9 * 5);
if (ImGui::Button("hex.builtin.popup.safety_backup.delete"_lang, ImVec2(width / 3, 0))) { if (ImGui::Button("hex.builtin.popup.safety_backup.delete"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
this->m_deleteCallback(); this->m_deleteCallback();
this->close(); this->close();
@ -131,7 +131,7 @@ namespace hex::plugin::builtin {
ImGui::SameLine((ImGui::GetMainViewport()->Size / 3 - ImGui::CalcTextSize("hex.builtin.common.close"_lang) - ImGui::GetStyle().FramePadding).x); ImGui::SameLine((ImGui::GetMainViewport()->Size / 3 - ImGui::CalcTextSize("hex.builtin.common.close"_lang) - ImGui::GetStyle().FramePadding).x);
if (ImGui::Button("hex.builtin.common.close"_lang)) if (ImGui::Button("hex.builtin.common.close"_lang) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape)))
Popup::close(); Popup::close();
} }
}; };

4
plugins/script_loader/source/script_api/v1/ui.cpp
View File

@ -34,7 +34,7 @@ public:
} }
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetCursorPosX(width / 9 * 5); ImGui::SetCursorPosX(width / 9 * 5);
if (ImGui::Button("hex.builtin.common.no"_lang, ImVec2(width / 3, 0))) { if (ImGui::Button("hex.builtin.common.no"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
s_yesNoQuestionBoxResult = false; s_yesNoQuestionBoxResult = false;
this->close(); this->close();
} }
@ -87,7 +87,7 @@ public:
ImGui::EndDisabled(); ImGui::EndDisabled();
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetCursorPosX(width / 9 * 5); ImGui::SetCursorPosX(width / 9 * 5);
if (ImGui::Button("hex.builtin.common.cancel"_lang, ImVec2(width / 3, 0))) { if (ImGui::Button("hex.builtin.common.cancel"_lang, ImVec2(width / 3, 0)) || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))) {
s_inputTextBoxResult = ""; s_inputTextBoxResult = "";
this->close(); this->close();
} }