From d59c47a5ded5ea5ea6ce6df12161dcc8d7bda0c9 Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 24 Dec 2021 23:27:01 +0000 Subject: [PATCH] Tidying AnnotationItem class in prep for value annotations --- .../HexViewerWidget/AnnotationItem.cpp | 4 ++-- .../HexViewerWidget/AnnotationItem.hpp | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.cpp index 97c1aa93..2ae5adcb 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.cpp @@ -20,8 +20,8 @@ height(position == AnnotationItemPosition::TOP ? AnnotationItem::TOP_HEIGHT : An } void AnnotationItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) { - static auto lineColor = this->getLineColor(); - static auto labelFontColor = this->getLabelFontColor(); + auto lineColor = this->getLineColor(); + auto labelFontColor = this->getLabelFontColor(); 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 6a7bf8ff..530c398e 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.hpp @@ -21,6 +21,7 @@ namespace Bloom::Widgets const int height; const std::uint32_t startAddress; const std::uint32_t endAddress; + const std::size_t size; AnnotationItemPosition position = AnnotationItemPosition::TOP; AnnotationItem( @@ -36,16 +37,14 @@ namespace Bloom::Widgets void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; protected: - [[nodiscard]] QColor getLineColor() const { + QString labelText; + + [[nodiscard]] virtual QColor getLineColor() const { return QColor(0x4F, 0x4F, 0x4F); } - [[nodiscard]] QColor getLabelFontColor() const { + [[nodiscard]] virtual QColor getLabelFontColor() const { return QColor(0x8A, 0x8A, 0x8D); } - - private: - std::size_t size = 0; - QString labelText; }; }