imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 13:37:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Updated ImGui to v1.90.5

Browse Source
This commit is contained in:
WerWolv
2024-04-12 22:56:10 +02:00
parent 43149498cf
commit e9ebfe36b0
27 changed files with 648 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/builtin/source/content/views/view_about.cpp
View File

@@ -766,7 +766,7 @@ namespace hex::plugin::builtin {
};
// Allow the window to be closed by pressing ESC
if (ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::IsKeyDown(ImGuiKey_Escape))
ImGui::CloseCurrentPopup();
if (ImGui::BeginTabBar("about_tab_bar")) {

2
plugins/builtin/source/content/views/view_command_palette.cpp
View File

@@ -36,7 +36,7 @@ namespace hex::plugin::builtin {
ImGui::BringWindowToFocusFront(ImGui::GetCurrentWindowRead());
// Close the popup if the user presses ESC
if (ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_Escape)))
if (ImGui::IsKeyDown(ImGuiKey_Escape))
ImGui::CloseCurrentPopup();

4
plugins/builtin/source/content/views/view_data_processor.cpp
View File

@@ -990,7 +990,7 @@ namespace hex::plugin::builtin {
// Handle deletion of links using the Delete key
{
const int selectedLinkCount = ImNodes::NumSelectedLinks();
if (selectedLinkCount > 0 && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) {
if (selectedLinkCount > 0 && ImGui::IsKeyPressed(ImGuiKey_Delete)) {
std::vector<int> selectedLinks;
selectedLinks.resize(static_cast<size_t>(selectedLinkCount));
ImNodes::GetSelectedLinks(selectedLinks.data());
@@ -1005,7 +1005,7 @@ namespace hex::plugin::builtin {
// Handle deletion of noes using the Delete key
{
const int selectedNodeCount = ImNodes::NumSelectedNodes();
if (selectedNodeCount > 0 && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) {
if (selectedNodeCount > 0 && ImGui::IsKeyPressed(ImGuiKey_Delete)) {
std::vector<int> selectedNodes;
selectedNodes.resize(static_cast<size_t>(selectedNodeCount));
ImNodes::GetSelectedNodes(selectedNodes.data());

2
plugins/builtin/source/content/views/view_hex_editor.cpp
View File

@@ -492,7 +492,7 @@ namespace hex::plugin::builtin {
ImGui::SetNextWindowPos(ImGui::GetWindowPos() + ImGui::GetWindowContentRegionMin() - ImGui::GetStyle().WindowPadding, ImGuiCond_Appearing);
if (ImGui::BeginPopup("##hex_editor_popup", ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize |ImGuiWindowFlags_NoTitleBar)) {
// Force close the popup when user is editing an input
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape))){
if (ImGui::IsKeyPressed(ImGuiKey_Escape)){
ImGui::CloseCurrentPopup();
}

2
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@@ -883,7 +883,7 @@ namespace hex::plugin::builtin {
ImGui::EndTable();
}
// Escape key to close the popup
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Escape), false))
if (ImGui::IsKeyPressed(ImGuiKey_Escape, false))
ImGui::CloseCurrentPopup();
ImGui::EndPopup();