From 47d0023044a1073551e2e04d838e810e7902c709 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 26 Nov 2023 20:11:55 -0500 Subject: [PATCH] InputScalar custom hex sizing adjustment --- src/app/gui/input.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/app/gui/input.cc b/src/app/gui/input.cc index beb1a400..cf50d364 100644 --- a/src/app/gui/input.cc +++ b/src/app/gui/input.cc @@ -4,6 +4,7 @@ #include #include "absl/strings/string_view.h" + namespace ImGui { static inline ImGuiInputTextFlags InputScalar_DefaultCharsFilter( @@ -31,17 +32,11 @@ bool InputScalarLeft(const char* label, ImGuiDataType data_type, void* p_data, char buf[64]; DataTypeFormatString(buf, IM_ARRAYSIZE(buf), data_type, p_data, format); - // Testing ActiveId as a minor optimization as filtering is not needed until - // active if (g.ActiveId == 0 && (flags & (ImGuiInputTextFlags_CharsDecimal | ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsScientific)) == 0) flags |= InputScalar_DefaultCharsFilter(data_type, format); - flags |= - ImGuiInputTextFlags_AutoSelectAll | - ImGuiInputTextFlags_NoMarkEdited; // We call MarkItemEdited() ourselves - // by comparing the actual data rather - // than the string. + flags |= ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_NoMarkEdited; bool value_changed = false; if (p_step == NULL) { @@ -59,9 +54,9 @@ bool InputScalarLeft(const char* label, ImGuiDataType data_type, void* p_data, // Place the label on the left of the input field ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, - ImVec2{style.ItemSpacing.x, style.ItemSpacing.y * 2}); + ImVec2{style.ItemSpacing.x, style.ItemSpacing.y}); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, - ImVec2{style.FramePadding.x, style.FramePadding.y * 2}); + ImVec2{style.FramePadding.x, style.FramePadding.y}); ImGui::AlignTextToFramePadding(); ImGui::Text("%s", label); ImGui::SameLine();