From 7971ad2070573eef2e960184b1daac7ee51a2c43 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Aug 2022 23:03:50 +0100 Subject: [PATCH] Added memory capacity label to bottom bar in memory inspection pane --- .../Stylesheets/InsightWindow.qss | 4 ++++ .../TargetMemoryInspectionPane.cpp | 3 +++ .../TargetMemoryInspectionPane.hpp | 1 + .../UiFiles/TargetMemoryInspectionPane.ui | 23 ++++++++++++++++++- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss index 4c6c37ac..23d95beb 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss +++ b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss @@ -333,6 +333,10 @@ QScrollBar::sub-line:vertical { max-width: 1px; } +#target-memory-inspection-pane #memory-capacity-label { + color: #8a8a8d; +} + #hex-viewer-container #tool-bar, #hex-viewer-container #search-bar { border-bottom: 1px solid #41423f; diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp index c9af6332..eb55a12c 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp @@ -75,6 +75,9 @@ namespace Bloom::Widgets this->detachPaneButton = this->container->findChild("detach-pane-btn"); this->attachPaneButton = this->container->findChild("attach-pane-btn"); + auto* memoryCapacityLabel = this->container->findChild("memory-capacity-label"); + memoryCapacityLabel->setText(QString::number(this->targetMemoryDescriptor.size()) + " Bytes"); + this->hexViewerWidget = new HexViewerWidget( this->targetMemoryDescriptor, this->settings.hexViewerWidgetSettings, diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.hpp index 67bbe39b..15c621d2 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.hpp @@ -12,6 +12,7 @@ #include "src/Targets/TargetState.hpp" #include "src/Insight/UserInterfaces/InsightWindow/Widgets/PanelWidget.hpp" #include "src/Insight/UserInterfaces/InsightWindow/Widgets/SvgToolButton.hpp" +#include "src/Insight/UserInterfaces/InsightWindow/Widgets/Label.hpp" #include "HexViewerWidget/HexViewerWidget.hpp" #include "MemoryRegionManager/MemoryRegionManagerWindow.hpp" diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui index 6a54da5a..088faa20 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui @@ -288,7 +288,28 @@ - + + + + Memory Capacity + + + + + + + + 5 + + + + QSizePolicy::Fixed + + + + + +