diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.cpp index f12269fd..e221973a 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.cpp @@ -50,10 +50,7 @@ namespace Bloom::Widgets auto lineColor = this->getLineColor(); auto labelFontColor = this->getLabelFontColor(); - auto font = painter->font(); - font.setPixelSize(this->getLabelFontSize()); - font.setItalic(false); - painter->setFont(font); + painter->setFont(this->getLabelFont()); const auto isEnabled = this->isEnabled(); diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.hpp index c4c9c96d..da2b6a7c 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include "src/Targets/TargetMemory.hpp" @@ -60,8 +61,15 @@ namespace Bloom::Widgets return QColor(0x68, 0x68, 0x68); } - [[nodiscard]] virtual int getLabelFontSize() const { - return 12; + [[nodiscard]] virtual const QFont& getLabelFont() const { + static auto labelFont = std::optional(); + + if (!labelFont.has_value()) { + labelFont = QFont("'Ubuntu', sans-serif"); + labelFont->setPixelSize(12); + } + + return labelFont.value(); } }; } diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.cpp index 2d68cba0..19064295 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.cpp @@ -26,10 +26,6 @@ namespace Bloom::Widgets } void ValueAnnotationItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) { - auto font = painter->font(); - font.setItalic(true); - painter->setFont(font); - AnnotationItem::paint(painter, option, widget); if (this->size > 1) { diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.hpp index a5553b9b..d25ed78f 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.hpp @@ -24,8 +24,16 @@ namespace Bloom::Widgets return QColor(0x94, 0x6F, 0x30); } - [[nodiscard]] int getLabelFontSize() const override { - return 11; + [[nodiscard]] const QFont& getLabelFont() const override { + static auto labelFont = std::optional(); + + if (!labelFont.has_value()) { + labelFont = QFont("'Ubuntu', sans-serif"); + labelFont->setPixelSize(11); + labelFont->setItalic(true); + } + + return labelFont.value(); } private: