Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-17 18:59:21 +01:00
Code Releases Wiki Activity

Fixed search selection and hex editor shortcuts

Browse Source
This commit is contained in:
WerWolv 2021-02-02 00:39:35 +01:00
parent 83bbde8d29
commit 29f50bb70b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/ImGui/include/imgui_memory_editor.h vendored
View File

@ -612,7 +612,7 @@ struct MemoryEditor
ImGui::BeginChild("##scrolling"); ImGui::BeginChild("##scrolling");
ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + (GotoAddr / Cols) * ImGui::GetTextLineHeight()); ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + (GotoAddr / Cols) * ImGui::GetTextLineHeight());
ImGui::EndChild(); ImGui::EndChild();
DataEditingAddr = DataPreviewAddr = GotoAddr; DataEditingAddr = DataPreviewAddr = DataPreviewAddrEnd = GotoAddr;
DataEditingTakeFocus = true; DataEditingTakeFocus = true;
} }
GotoAddr = (size_t)-1; GotoAddr = (size_t)-1;

8
source/views/view_hexeditor.cpp
View File

@ -478,13 +478,13 @@ namespace hex {
saveAs(); saveAs();
return true; return true;
} else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_F) { } else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_F) {
ImGui::OpenPopup("Search"); View::doLater([]{ ImGui::OpenPopup("Search"); });
return true; return true;
} else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_G) { } else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_G) {
ImGui::OpenPopup("Goto"); View::doLater([]{ ImGui::OpenPopup("Goto"); });
return true; return true;
} else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_O) { } else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_O) {
ImGui::OpenPopup("Open File"); View::doLater([]{ ImGui::OpenPopup("Open File"); });
return true; return true;
} else if (mods == (GLFW_MOD_CONTROL | GLFW_MOD_ALT) && key == GLFW_KEY_C) { } else if (mods == (GLFW_MOD_CONTROL | GLFW_MOD_ALT) && key == GLFW_KEY_C) {
this->copyBytes(); this->copyBytes();
@ -915,7 +915,7 @@ R"(
} }
}; };
if (ImGui::BeginPopup("Search")) { if (ImGui::BeginPopupContextVoid("Search")) {
ImGui::TextUnformatted("Search"); ImGui::TextUnformatted("Search");
if (ImGui::BeginTabBar("searchTabs")) { if (ImGui::BeginTabBar("searchTabs")) {
char *currBuffer; char *currBuffer;