From 1a8a9e53e140972120b800ee6500306e709cbe2e Mon Sep 17 00:00:00 2001 From: WerWolv Date: Tue, 12 Dec 2023 13:20:51 +0100 Subject: [PATCH] impr: More information view UI improvements --- .../builtin/include/content/views/view_information.hpp | 2 +- plugins/builtin/include/ui/widgets.hpp | 6 +++--- plugins/builtin/source/content/views/view_information.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/builtin/include/content/views/view_information.hpp b/plugins/builtin/include/content/views/view_information.hpp index e2c897f39..d8a0b5c1c 100644 --- a/plugins/builtin/include/content/views/view_information.hpp +++ b/plugins/builtin/include/content/views/view_information.hpp @@ -45,7 +45,7 @@ namespace hex::plugin::builtin { void analyze(); - int m_inputChunkSize = 0; + u32 m_inputChunkSize = 0; ui::RegionType m_selectionType = ui::RegionType::EntireData; }; diff --git a/plugins/builtin/include/ui/widgets.hpp b/plugins/builtin/include/ui/widgets.hpp index f3442b7a5..c42f487c5 100644 --- a/plugins/builtin/include/ui/widgets.hpp +++ b/plugins/builtin/include/ui/widgets.hpp @@ -40,15 +40,15 @@ namespace hex::plugin::builtin::ui { case RegionType::Region: ImGui::SameLine(); - const auto width = ImGui::GetContentRegionAvail().x / 2 - ImGui::CalcTextSize(" - ").x / 2 - ImGui::GetStyle().FramePadding.x * 4; + const auto width = ImGui::GetContentRegionAvail().x / 2 - ImGui::CalcTextSize(" - ").x / 2; u64 start = region->getStartAddress(), end = region->getEndAddress(); ImGui::PushItemWidth(width); ImGuiExt::InputHexadecimal("##start", &start); ImGui::PopItemWidth(); - ImGui::SameLine(); + ImGui::SameLine(0, 0); ImGui::TextUnformatted(" - "); - ImGui::SameLine(); + ImGui::SameLine(0, 0); ImGui::PushItemWidth(width); ImGuiExt::InputHexadecimal("##end", &end); ImGui::PopItemWidth(); diff --git a/plugins/builtin/source/content/views/view_information.cpp b/plugins/builtin/source/content/views/view_information.cpp index 07f6e3432..8c0f9e023 100644 --- a/plugins/builtin/source/content/views/view_information.cpp +++ b/plugins/builtin/source/content/views/view_information.cpp @@ -73,7 +73,7 @@ namespace hex::plugin::builtin { this->m_analyzedRegion = { provider->getBaseAddress(), provider->getActualSize() }; } - if (this->m_inputChunkSize <= 0) { + if (this->m_inputChunkSize == 0) { this->m_inputChunkSize = 256; } @@ -144,14 +144,14 @@ namespace hex::plugin::builtin { ImGuiExt::BeginSubWindow("hex.builtin.common.settings"_lang); { if (ImGui::BeginTable("SettingsTable", 2, ImGuiTableFlags_BordersInner | ImGuiTableFlags_SizingFixedSame, ImVec2(ImGui::GetContentRegionAvail().x, 0))) { - ImGui::TableSetupColumn("Left", ImGuiTableColumnFlags_WidthStretch, 0.3F); - ImGui::TableSetupColumn("Right", ImGuiTableColumnFlags_WidthStretch, 0.7F); + ImGui::TableSetupColumn("Left", ImGuiTableColumnFlags_WidthStretch, 0.5F); + ImGui::TableSetupColumn("Right", ImGuiTableColumnFlags_WidthStretch, 0.5F); ImGui::TableNextRow(); ImGui::TableNextColumn(); ui::regionSelectionPicker(&this->m_analysisRegion, provider, &this->m_selectionType, false); ImGui::TableNextColumn(); - ImGui::InputInt("hex.builtin.view.information.block_size"_lang, &this->m_inputChunkSize, ImGuiInputTextFlags_CharsDecimal); + ImGuiExt::InputHexadecimal("hex.builtin.view.information.block_size"_lang, &this->m_inputChunkSize); ImGui::EndTable(); }