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

fix: Hex editor selection not showing rendering properly

This commit is contained in:
WerWolv 2022-10-10 20:33:34 +02:00
parent 86e33a1ee9
commit e78c452daf
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/builtin/source/content/views/view_hex_editor.cpp
View File

@ -523,9 +523,6 @@ namespace hex::plugin::builtin {
} }
std::optional<color_t> ViewHexEditor::applySelectionColor(u64 byteAddress, std::optional<color_t> color) { std::optional<color_t> ViewHexEditor::applySelectionColor(u64 byteAddress, std::optional<color_t> color) {
if (!color.has_value())
return std::nullopt;
if (this->isSelectionValid()) { if (this->isSelectionValid()) {
auto selection = this->getSelection(); auto selection = this->getSelection();
@ -873,12 +870,14 @@ namespace hex::plugin::builtin {
if (y == u64(clipper.DisplayStart)) if (y == u64(clipper.DisplayStart))
cellSize.y -= (ImGui::GetStyle().CellPadding.y + 1); cellSize.y -= (ImGui::GetStyle().CellPadding.y + 1);
backgroundColor = applySelectionColor(byteAddress, backgroundColor);
// Draw highlights and selection // Draw highlights and selection
if (backgroundColor.has_value()) { if (backgroundColor.has_value()) {
auto drawList = ImGui::GetWindowDrawList(); auto drawList = ImGui::GetWindowDrawList();
// Draw background color // Draw background color
drawList->AddRectFilled(cellStartPos, cellStartPos + cellSize, applySelectionColor(byteAddress, backgroundColor).value()); drawList->AddRectFilled(cellStartPos, cellStartPos + cellSize, backgroundColor.value());
// Draw frame around mouse selection // Draw frame around mouse selection
this->drawSelectionFrame(x, y, byteAddress, bytesPerCell, cellStartPos, cellSize); this->drawSelectionFrame(x, y, byteAddress, bytesPerCell, cellStartPos, cellSize);
@ -935,12 +934,14 @@ namespace hex::plugin::builtin {
auto [foregroundColor, backgroundColor] = cellColors[x / bytesPerCell]; auto [foregroundColor, backgroundColor] = cellColors[x / bytesPerCell];
backgroundColor = applySelectionColor(byteAddress, backgroundColor);
// Draw highlights and selection // Draw highlights and selection
if (backgroundColor.has_value()) { if (backgroundColor.has_value()) {
auto drawList = ImGui::GetWindowDrawList(); auto drawList = ImGui::GetWindowDrawList();
// Draw background color // Draw background color
drawList->AddRectFilled(cellStartPos, cellStartPos + cellSize, applySelectionColor(byteAddress, backgroundColor).value()); drawList->AddRectFilled(cellStartPos, cellStartPos + cellSize, backgroundColor.value());
this->drawSelectionFrame(x, y, byteAddress, 1, cellStartPos, cellSize); this->drawSelectionFrame(x, y, byteAddress, 1, cellStartPos, cellSize);
} }
@ -993,12 +994,14 @@ namespace hex::plugin::builtin {
if (x < validBytes && isCurrRegionValid(address)) { if (x < validBytes && isCurrRegionValid(address)) {
auto [foregroundColor, backgroundColor] = cellColors[x / bytesPerCell]; auto [foregroundColor, backgroundColor] = cellColors[x / bytesPerCell];
backgroundColor = applySelectionColor(address, backgroundColor);
// Draw highlights and selection // Draw highlights and selection
if (backgroundColor.has_value()) { if (backgroundColor.has_value()) {
auto drawList = ImGui::GetWindowDrawList(); auto drawList = ImGui::GetWindowDrawList();
// Draw background color // Draw background color
drawList->AddRectFilled(cellStartPos, cellStartPos + cellSize, applySelectionColor(address, backgroundColor).value()); drawList->AddRectFilled(cellStartPos, cellStartPos + cellSize, backgroundColor.value());
this->drawSelectionFrame(x, y, address, 1, cellStartPos, cellSize); this->drawSelectionFrame(x, y, address, 1, cellStartPos, cellSize);
} }