From bc7f7dae56d60ff1edf6a158c0a20671e16d40eb Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Wed, 15 Dec 2021 22:11:07 +0000
Subject: [PATCH] Removed unnecessary VBoxLayout from byte item container in
 the hex viewier widget

---
 .../HexViewerWidget/HexViewerWidget.cpp            | 14 ++++++++------
 .../HexViewerWidget/HexViewerWidget.hpp            |  3 +++
 .../HexViewerWidget/UiFiles/HexViewerWidget.ui     | 10 +---------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.cpp
index 4dfce503..d64f0e1b 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.cpp
@@ -61,19 +61,15 @@ HexViewerWidget::HexViewerWidget(
 
     this->hoveredAddressLabel = this->bottomBar->findChild<QLabel*>("byte-address-label");
 
-    auto* byteItemGraphicsViewContainer = this->container->findChild<QWidget*>("graphics-view-container");
-    auto* byteItemGraphicsViewLayout = byteItemGraphicsViewContainer->findChild<QVBoxLayout*>(
-        "byte-item-container-layout"
-    );
+    this->byteItemGraphicsViewContainer = this->container->findChild<QWidget*>("graphics-view-container");
     this->byteItemGraphicsView = new ByteItemContainerGraphicsView(
         targetMemoryDescriptor,
         insightWorker,
         this->settings,
         this->hoveredAddressLabel,
-        byteItemGraphicsViewContainer
+        this->byteItemGraphicsViewContainer
     );
     this->byteItemGraphicsScene = this->byteItemGraphicsView->getScene();
-    byteItemGraphicsViewLayout->insertWidget(0, this->byteItemGraphicsView);
 
     this->setStackMemoryHighlightingEnabled(true);
     this->setHoveredRowAndColumnHighlightingEnabled(true);
@@ -130,6 +126,12 @@ void HexViewerWidget::resizeEvent(QResizeEvent* event) {
         this->width(),
         this->height()
     );
+
+    this->byteItemGraphicsView->setFixedSize(this->byteItemGraphicsViewContainer->size());
+}
+
+void HexViewerWidget::showEvent(QShowEvent* event) {
+    this->byteItemGraphicsView->setFixedSize(this->byteItemGraphicsViewContainer->size());
 }
 
 void HexViewerWidget::onTargetStateChanged(Targets::TargetState newState) {
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.hpp
index 18763cb9..a419f314 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.hpp
@@ -9,6 +9,7 @@
 #include <QSize>
 #include <QString>
 #include <QEvent>
+#include <QShowEvent>
 #include <optional>
 
 #include "src/Targets/TargetMemory.hpp"
@@ -42,6 +43,7 @@ namespace Bloom::Widgets
 
     protected:
         void resizeEvent(QResizeEvent* event) override;
+        void showEvent(QShowEvent* event) override;
 
     private:
         const Targets::TargetMemoryDescriptor& targetMemoryDescriptor;
@@ -53,6 +55,7 @@ namespace Bloom::Widgets
         QWidget* toolBar = nullptr;
         QWidget* bottomBar = nullptr;
 
+        QWidget* byteItemGraphicsViewContainer = nullptr;
         ByteItemContainerGraphicsView* byteItemGraphicsView = nullptr;
         ByteItemGraphicsScene* byteItemGraphicsScene = nullptr;
         QLabel* hoveredAddressLabel = nullptr;
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui
index 72205a93..de8494d8 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui
@@ -121,16 +121,8 @@
             <item>
                 <widget class="QWidget" name="graphics-view-container">
                     <property name="sizePolicy">
-                        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Ignored"/>
+                        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"/>
                     </property>
-                    <layout class="QVBoxLayout" name="byte-item-container-layout">
-                        <property name="spacing">
-                            <number>0</number>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                    </layout>
                 </widget>
             </item>
             <item>