Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-12 08:43:03 +01:00
Code Releases Wiki Activity

patterns: Allow bitfield fields to be edited properly, improve type formatting

Browse Source
This commit is contained in:
WerWolv 2024-06-25 16:14:28 +02:00
parent b54bb6cd56
commit f754560bca
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/external/pattern_language vendored

@ -1 +1 @@
Subproject commit 050c995c085e1312245b558f98ed7a2ab78913e4 Subproject commit 099486a26f5248d2e99a01b464243fa29c46dd81

38
plugins/ui/source/ui/pattern_drawer.cpp
View File

@ -501,7 +501,24 @@ namespace hex::ui {
drawOffsetColumnForBitfieldMember(pattern); drawOffsetColumnForBitfieldMember(pattern);
drawSizeColumnForBitfieldMember(pattern); drawSizeColumnForBitfieldMember(pattern);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGuiExt::TextFormattedColored(ImColor(0xFF9BC64D), "bits");
if (dynamic_cast<pl::ptrn::PatternBitfieldFieldSigned*>(&pattern) != nullptr) {
ImGuiExt::TextFormattedColored(ImColor(0xFFD69C56), "signed");
ImGui::SameLine();
ImGuiExt::TextFormattedColored(ImColor(0xFF9BC64D), pattern.getBitSize() == 1 ? "bit" : "bits");
} else if (dynamic_cast<pl::ptrn::PatternBitfieldFieldEnum*>(&pattern) != nullptr) {
ImGuiExt::TextFormattedColored(ImColor(0xFFD69C56), "enum");
ImGui::SameLine();
ImGui::TextUnformatted(pattern.getTypeName().c_str());
} else if (dynamic_cast<pl::ptrn::PatternBitfieldFieldBoolean*>(&pattern) != nullptr) {
ImGuiExt::TextFormattedColored(ImColor(0xFF9BC64D), "bool");
ImGui::SameLine();
ImGuiExt::TextFormattedColored(ImColor(0xFF9BC64D), "bit");
} else {
ImGuiExt::TextFormattedColored(ImColor(0xFFD69C56), "unsigned");
ImGui::SameLine();
ImGuiExt::TextFormattedColored(ImColor(0xFF9BC64D), pattern.getBitSize() == 1 ? "bit" : "bits");
}
if (!this->isEditingPattern(pattern)) { if (!this->isEditingPattern(pattern)) {
drawValueColumn(pattern); drawValueColumn(pattern);
@ -513,7 +530,24 @@ namespace hex::ui {
auto value = pattern.getValue(); auto value = pattern.getValue();
auto valueString = pattern.toString(); auto valueString = pattern.toString();
if (pattern.getBitSize() == 1) { if (auto enumPattern = dynamic_cast<pl::ptrn::PatternBitfieldFieldEnum*>(&pattern); enumPattern != nullptr) {
if (ImGui::BeginCombo("##Enum", pattern.getFormattedValue().c_str())) {
auto currValue = pattern.getValue().toUnsigned();
for (auto &enumValue : enumPattern->getEnumValues()) {
auto min = enumValue.min.toUnsigned();
auto max = enumValue.max.toUnsigned();
bool isSelected = min <= currValue && max >= currValue;
if (ImGui::Selectable(fmt::format("{}::{}", pattern.getTypeName(), enumValue.name, min, pattern.getSize() * 2).c_str(), isSelected)) {
pattern.setValue(enumValue.min);
this->resetEditing();
}
if (isSelected)
ImGui::SetItemDefaultFocus();
}
ImGui::EndCombo();
}
} else if (dynamic_cast<pl::ptrn::PatternBitfieldFieldBoolean*>(&pattern) != nullptr) {
bool boolValue = value.toBoolean(); bool boolValue = value.toBoolean();
if (ImGui::Checkbox("##boolean", &boolValue)) { if (ImGui::Checkbox("##boolean", &boolValue)) {
pattern.setValue(boolValue); pattern.setValue(boolValue);