Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-12 10:10:53 +01:00
Code Releases Wiki Activity

ui: Improve layout of hex editor footer

Browse Source
This commit is contained in:
WerWolv 2022-01-11 23:05:02 +01:00
parent cbfe52c756
commit 2f1a707fd3
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,7 +268,7 @@ struct MemoryEditor
const float height_separator = style.ItemSpacing.y;
float footer_height = 0;
if (OptShowOptions)
footer_height += height_separator + ImGui::GetFrameHeightWithSpacing() * 1;
footer_height += height_separator + ImGui::GetFrameHeightWithSpacing() * 2;
ImGui::BeginChild("offset", ImVec2(0, s.LineHeight), false, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoNav);
ImGui::Text("%*c ", s.AddrDigitsCount, ' ');
@ -731,7 +731,7 @@ struct MemoryEditor
if (GotoAddr < mem_size)
{
ImGui::BeginChild("##scrolling");
ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + (GotoAddr / Cols) * ImGui::GetTextLineHeight());
ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + (GotoAddr / Cols) * ImGui::GetTextLineHeight() * 2);
ImGui::EndChild();
}
GotoAddr = (size_t)-1;

13
plugins/builtin/source/content/views/view_hexeditor.cpp
View File

@ -175,11 +175,11 @@ namespace hex::plugin::builtin {
}
if (provider->getPageCount() > 1) {
ImGui::SameLine();
ImGui::NewLine();
ImGui::TextFormatted("hex.builtin.view.hexeditor.page"_lang, provider->getCurrentPage() + 1, provider->getPageCount());
auto linePos = ImGui::GetCursorPosY() - 15 * SharedData::globalScale;
ImGui::SameLine();
ImGui::SetCursorPosY(linePos);
if (ImGui::ArrowButton("prevPage", ImGuiDir_Left)) {
provider->setCurrentPage(provider->getCurrentPage() - 1);
@ -194,6 +194,13 @@ namespace hex::plugin::builtin {
EventManager::post<EventRegionSelected>(Region { std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd), 1 });
}
ImGui::SameLine();
ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
ImGui::SameLine();
ImGui::SetCursorPosY(linePos);
ImGui::TextFormatted("hex.builtin.view.hexeditor.page"_lang, provider->getCurrentPage() + 1, provider->getPageCount());
}
this->drawSearchPopup();