Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow mouse highlighting of bytes highlighted by pattern

This commit is contained in:
WerWolv 2020-11-19 22:34:56 +01:00
parent bfb079cb4f
commit 6a815d5ebb
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ImGui/include/imgui_memory_editor.h
View File

@ -60,6 +60,8 @@
#pragma warning (disable: 4996) // warning C4996: 'sprintf': This function or variable may be unsafe. #pragma warning (disable: 4996) // warning C4996: 'sprintf': This function or variable may be unsafe.
#endif #endif
ImU32 ImAlphaBlendColors(ImU32 col_a, ImU32 col_b);
struct MemoryEditor struct MemoryEditor
{ {
enum DataFormat enum DataFormat
@ -315,7 +317,12 @@ struct MemoryEditor
if (OptMidColsCount > 0 && n > 0 && (n + 1) < Cols && ((n + 1) % OptMidColsCount) == 0) if (OptMidColsCount > 0 && n > 0 && (n + 1) < Cols && ((n + 1) % OptMidColsCount) == 0)
highlight_width += s.SpacingBetweenMidCols; highlight_width += s.SpacingBetweenMidCols;
} }
draw_list->AddRectFilled(pos, ImVec2(pos.x + highlight_width, pos.y + s.LineHeight), HighlightColor);
ImU32 color = HighlightColor;
if ((is_highlight_from_user_range + is_highlight_from_user_func + is_highlight_from_preview) > 1)
color = (ImAlphaBlendColors(HighlightColor, 0x60C08080) & 0x00FFFFFF) | 0x90000000;
draw_list->AddRectFilled(pos, ImVec2(pos.x + highlight_width, pos.y + s.LineHeight), color);
} }
if (DataEditingAddr == addr) if (DataEditingAddr == addr)

2
source/views/view_hexeditor.cpp
View File

@ -46,7 +46,7 @@ namespace hex {
} }
} }
_this->m_memoryEditor.HighlightColor = 0x50C08080; _this->m_memoryEditor.HighlightColor = 0x60C08080;
return false; return false;
}; };