doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added ByteItem ASCII view

Browse Source 
Including some conditional styling
This commit is contained in:
Nav
2021-12-26 18:06:39 +00:00
parent 38afcfd84c
commit 910eb97561
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.cpp
View File

@@ -39,7 +39,7 @@ void ByteItem::setValue(unsigned char value) {
this->value = value; this->value = value;
this->hexValue = QString::number(this->value, 16).rightJustified(2, '0').toUpper(); this->hexValue = QString::number(this->value, 16).rightJustified(2, '0').toUpper();
this->asciiValue = (this->value >= 32 && this->value <= 126) this->asciiValue = (this->value >= 32 && this->value <= 126)
? std::optional(QString(QChar(this->value))) : std::nullopt; ? std::optional("'" + QString(QChar(this->value)) + "'") : std::nullopt;
this->valueInitialised = this->excludedMemoryRegion == nullptr; this->valueInitialised = this->excludedMemoryRegion == nullptr;
this->update(); this->update();
@@ -52,6 +52,7 @@ void ByteItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
static const auto widgetRect = this->boundingRect(); static const auto widgetRect = this->boundingRect();
static const auto standardTextColor = QColor(0xAF, 0xB1, 0xB3); static const auto standardTextColor = QColor(0xAF, 0xB1, 0xB3);
static const auto valueChangedTextColor = QColor(0x54, 0x7F, 0xBA); static const auto valueChangedTextColor = QColor(0x54, 0x7F, 0xBA);
auto asciiTextColor = QColor(0xA7, 0x77, 0x26);
static auto font = QFont("'Ubuntu', sans-serif"); static auto font = QFont("'Ubuntu', sans-serif");
static const auto focusedRegionBackgroundColor = QColor(0x44, 0x44, 0x41, 255); static const auto focusedRegionBackgroundColor = QColor(0x44, 0x44, 0x41, 255);
@@ -72,6 +73,7 @@ void ByteItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
) { ) {
// This byte is within the stack memory // This byte is within the stack memory
backgroundColor = stackMemoryBackgroundColor; backgroundColor = stackMemoryBackgroundColor;
asciiTextColor = standardTextColor;
} else if (this->settings.highlightFocusedMemory && this->focusedMemoryRegion != nullptr) { } else if (this->settings.highlightFocusedMemory && this->focusedMemoryRegion != nullptr) {
// This byte is within a focused region // This byte is within a focused region
@@ -122,12 +124,23 @@ void ByteItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
} }
if (this->valueInitialised && this->excludedMemoryRegion == nullptr) { if (this->valueInitialised && this->excludedMemoryRegion == nullptr) {
if (this->settings.displayAsciiValues && this->asciiValue.has_value()) {
if (!isEnabled) { if (!isEnabled) {
asciiTextColor.setAlpha(100);
}
painter->setPen(asciiTextColor);
painter->drawText(widgetRect, Qt::AlignCenter, this->asciiValue.value());
} else {
if (!isEnabled || this->settings.displayAsciiValues) {
textColor.setAlpha(100); textColor.setAlpha(100);
} }
painter->setPen(textColor); painter->setPen(textColor);
painter->drawText(widgetRect, Qt::AlignCenter, this->hexValue); painter->drawText(widgetRect, Qt::AlignCenter, this->hexValue);
return;
}
} else { } else {
textColor.setAlpha(100); textColor.setAlpha(100);