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

fix: Editing hex editor cells not working on some systems

Browse Source
This commit is contained in:
WerWolv 2022-10-22 09:07:47 +02:00
parent 33a0ee37fa
commit b5f7be2384
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/builtin/source/content/data_visualizers.cpp
View File

@ -23,6 +23,19 @@ namespace hex::plugin::builtin {
else static_assert(hex::always_false<T>::value, "Invalid data type!"); else static_assert(hex::always_false<T>::value, "Invalid data type!");
} }
template<typename T>
constexpr const char *getFormatLengthSpecifier() {
if constexpr (std::same_as<T, u8>) return "hh";
else if constexpr (std::same_as<T, u16>) return "h";
else if constexpr (std::same_as<T, u32>) return "l";
else if constexpr (std::same_as<T, u64>) return "ll";
else if constexpr (std::same_as<T, i8>) return "hh";
else if constexpr (std::same_as<T, i16>) return "h";
else if constexpr (std::same_as<T, i32>) return "l";
else if constexpr (std::same_as<T, i64>) return "ll";
else static_assert(hex::always_false<T>::value, "Invalid data type!");
}
template<std::integral T> template<std::integral T>
class DataVisualizerHexadecimal : public hex::ContentRegistry::HexEditor::DataVisualizer { class DataVisualizerHexadecimal : public hex::ContentRegistry::HexEditor::DataVisualizer {
public: public:
@ -51,8 +64,8 @@ namespace hex::plugin::builtin {
constexpr static inline auto ByteCount = sizeof(T); constexpr static inline auto ByteCount = sizeof(T);
constexpr static inline auto CharCount = ByteCount * 2; constexpr static inline auto CharCount = ByteCount * 2;
const static inline auto FormattingUpperCase = hex::format("%0{}llX", CharCount); const static inline auto FormattingUpperCase = hex::format("%0{}{}X", CharCount, getFormatLengthSpecifier<T>());
const static inline auto FormattingLowerCase = hex::format("%0{}llx", CharCount); const static inline auto FormattingLowerCase = hex::format("%0{}{}x", CharCount, getFormatLengthSpecifier<T>());
const char *getFormatString(bool upperCase) { const char *getFormatString(bool upperCase) {
if (upperCase) if (upperCase)
@ -104,8 +117,8 @@ namespace hex::plugin::builtin {
constexpr static inline auto ByteCount = 1; constexpr static inline auto ByteCount = 1;
constexpr static inline auto CharCount = ByteCount * 2; constexpr static inline auto CharCount = ByteCount * 2;
const static inline auto FormattingUpperCase = hex::format("%0{}llX", CharCount); const static inline auto FormattingUpperCase = hex::format("%0{}{}}X", CharCount, getFormatLengthSpecifier<u8>());
const static inline auto FormattingLowerCase = hex::format("%0{}llx", CharCount); const static inline auto FormattingLowerCase = hex::format("%0{}{}x", CharCount, getFormatLengthSpecifier<u8>());
static const char *getFormatString(bool upperCase) { static const char *getFormatString(bool upperCase) {
if (upperCase) if (upperCase)
@ -154,7 +167,7 @@ namespace hex::plugin::builtin {
constexpr static inline auto ByteCount = sizeof(T); constexpr static inline auto ByteCount = sizeof(T);
constexpr static inline auto CharCount = std::numeric_limits<T>::digits10 + 2; constexpr static inline auto CharCount = std::numeric_limits<T>::digits10 + 2;
const static inline auto FormatString = hex::format("%{}{}", CharCount, std::is_signed<T>::value ? "lld" : "llu"); const static inline auto FormatString = hex::format("%{}{}{}", CharCount, getFormatLengthSpecifier<T>(), std::is_signed<T>::value ? "d" : "u");
const char *getFormatString() { const char *getFormatString() {
return FormatString.c_str(); return FormatString.c_str();