imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-27 23:37:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: [[format_write]] attribute not working as expected on integer and floating point types

Browse Source
This commit is contained in:
WerWolv
2026-01-18 21:56:09 +01:00
parent a7e94e31c9
commit 0e41813cfc
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
plugins/ui/source/ui/pattern_value_editor.cpp
View File

@@ -63,19 +63,28 @@ namespace hex::ui {
}
} else if (std::holds_alternative<i128>(value)) {
if (ImGui::InputText("##Value", valueString, ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_EnterReturnsTrue)) {
wolv::math_eval::MathEvaluator<i128> mathEvaluator;
if (pattern.getWriteFormatterFunction().empty()) {
wolv::math_eval::MathEvaluator<i128> mathEvaluator;
if (auto result = mathEvaluator.evaluate(valueString); result.has_value())
pattern.setValue(result.value());
if (auto result = mathEvaluator.evaluate(valueString); result.has_value())
pattern.setValue(result.value());
} else {
pattern.setValue(valueString);
}
m_onEditCallback();
}
} else if (std::holds_alternative<u128>(value)) {
if (ImGui::InputText("##Value", valueString, ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_EnterReturnsTrue)) {
wolv::math_eval::MathEvaluator<u128> mathEvaluator;
if (pattern.getWriteFormatterFunction().empty()) {
wolv::math_eval::MathEvaluator<u128> mathEvaluator;
if (auto result = mathEvaluator.evaluate(valueString); result.has_value())
pattern.setValue(result.value());
} else {
pattern.setValue(valueString);
}
if (auto result = mathEvaluator.evaluate(valueString); result.has_value())
pattern.setValue(result.value());
m_onEditCallback();
}
@@ -129,10 +138,14 @@ namespace hex::ui {
void PatternValueEditor::visit(pl::ptrn::PatternFloat& pattern) {
auto value = pattern.toString();
if (ImGui::InputText("##Value", value, ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_EnterReturnsTrue)) {
wolv::math_eval::MathEvaluator<long double> mathEvaluator;
if (pattern.getWriteFormatterFunction().empty()) {
wolv::math_eval::MathEvaluator<long double> mathEvaluator;
if (auto result = mathEvaluator.evaluate(value); result.has_value())
pattern.setValue(double(result.value()));
if (auto result = mathEvaluator.evaluate(value); result.has_value())
pattern.setValue(double(result.value()));
} else {
pattern.setValue(value);
}
m_onEditCallback();
}
@@ -149,10 +162,14 @@ namespace hex::ui {
void PatternValueEditor::visit(pl::ptrn::PatternSigned& pattern) {
auto value = pattern.getFormattedValue();
if (ImGui::InputText("##Value", value, ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_EnterReturnsTrue)) {
wolv::math_eval::MathEvaluator<i128> mathEvaluator;
if (pattern.getWriteFormatterFunction().empty()) {
wolv::math_eval::MathEvaluator<i128> mathEvaluator;
if (auto result = mathEvaluator.evaluate(value); result.has_value())
pattern.setValue(result.value());
if (auto result = mathEvaluator.evaluate(value); result.has_value())
pattern.setValue(result.value());
} else {
pattern.setValue(value);
}
m_onEditCallback();
}
@@ -185,10 +202,14 @@ namespace hex::ui {
void PatternValueEditor::visit(pl::ptrn::PatternUnsigned& pattern) {
auto value = pattern.toString();
if (ImGui::InputText("##Value", value, ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_EnterReturnsTrue)) {
wolv::math_eval::MathEvaluator<u128> mathEvaluator;
if (pattern.getWriteFormatterFunction().empty()) {
wolv::math_eval::MathEvaluator<u128> mathEvaluator;
if (auto result = mathEvaluator.evaluate(value); result.has_value())
pattern.setValue(result.value());
if (auto result = mathEvaluator.evaluate(value); result.has_value())
pattern.setValue(result.value());
} else {
pattern.setValue(value);
}
m_onEditCallback();
}