From e0df4c58f3e2d119e22414ffeb8bd8edae08ef53 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sun, 13 Feb 2022 14:09:24 +0000
Subject: [PATCH] Removed fixed window size for the register inspection window

---
 .../RegisterHistoryWidget.cpp                    |  6 ++++--
 .../UiFiles/RegisterHistoryWidget.ui             |  7 +++++--
 .../TargetRegisterInspectorWindow.cpp            | 16 ++++++++++------
 .../TargetRegisterInspectorWindow.hpp            |  3 +++
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget/RegisterHistoryWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget/RegisterHistoryWidget.cpp
index 774556c9..bb65fc21 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget/RegisterHistoryWidget.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget/RegisterHistoryWidget.cpp
@@ -29,6 +29,8 @@ namespace Bloom::Widgets
         this->setObjectName("target-register-history-widget");
         this->setFixedWidth(300);
 
+        this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+
         auto widgetUiFile = QFile(
             QString::fromStdString(Paths::compiledResourcesPath()
                 + "/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget"
@@ -42,7 +44,7 @@ namespace Bloom::Widgets
 
         auto uiLoader = UiLoader(this);
         this->container = uiLoader.load(&widgetUiFile, this);
-        this->container->setFixedSize(this->size());
+        this->container->setMinimumSize(this->size());
         this->container->setContentsMargins(1, 1, 1, 1);
 
         this->itemContainer = this->container->findChild<QWidget*>("item-container");
@@ -104,7 +106,7 @@ namespace Bloom::Widgets
     }
 
     void RegisterHistoryWidget::resizeEvent(QResizeEvent* event) {
-        this->container->setFixedSize(
+        this->container->setMinimumSize(
             this->width(),
             this->height()
         );
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget/UiFiles/RegisterHistoryWidget.ui b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget/UiFiles/RegisterHistoryWidget.ui
index e989d836..0416937d 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget/UiFiles/RegisterHistoryWidget.ui
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget/UiFiles/RegisterHistoryWidget.ui
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
     <widget class="QWidget" name="container">
+        <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"/>
+        </property>
         <layout class="QVBoxLayout">
             <property name="spacing">
                 <number>0</number>
@@ -8,7 +11,7 @@
             <property name="margin">
                 <number>0</number>
             </property>
-            <item alignment="Qt::AlignCenter">
+            <item>
                 <widget class="QWidget" name="title-bar">
                     <property name="minimumHeight">
                         <number>30</number>
@@ -18,7 +21,7 @@
                     </widget>
                 </widget>
             </item>
-            <item alignment="Qt::AlignTop">
+            <item>
                 <widget class="ExpandingHeightScrollAreaWidget" name="item-scroll-area">
                     <property name="widgetResizable"><bool>true</bool></property>
                     <property name="verticalScrollBarPolicy"><enum>Qt::ScrollBarAsNeeded</enum></property>
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/TargetRegisterInspectorWindow.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/TargetRegisterInspectorWindow.cpp
index 42d2e723..dc64e155 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/TargetRegisterInspectorWindow.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/TargetRegisterInspectorWindow.cpp
@@ -72,12 +72,12 @@ namespace Bloom::Widgets
         auto containerMargins = QMargins(15, 30, 15, 10);
 
         this->setStyleSheet(windowStylesheet.readAll());
-        this->setFixedSize(windowSize);
+        this->setMinimumSize(windowSize);
 
         auto uiLoader = UiLoader(this);
         this->container = uiLoader.load(&windowUiFile, this);
 
-        this->container->setFixedSize(this->size());
+        this->container->setMinimumSize(this->size());
         this->container->setContentsMargins(containerMargins);
 
         this->registerNameLabel = this->container->findChild<QLabel*>("register-name");
@@ -132,8 +132,6 @@ namespace Bloom::Widgets
             "0x" + QString::number(this->registerDescriptor.startAddress.value(), 16).toUpper()
         );
 
-        this->registerValueTextInput->setFixedWidth(BitsetWidget::WIDTH * 2);
-
         if (!this->registerDescriptor.writable) {
             this->registerValueTextInput->setDisabled(true);
             this->applyButton->setVisible(false);
@@ -176,6 +174,7 @@ namespace Bloom::Widgets
             this->bitsetWidgets.push_back(bitsetWidget);
 
             if (((registerByteIndex + 1) % 2) == 0) {
+                bitsetSingleHorizontalLayout->addStretch(1);
                 registerBitsetWidgetLayout->addLayout(bitsetSingleHorizontalLayout);
                 bitsetSingleHorizontalLayout = new QHBoxLayout();
                 bitsetSingleHorizontalLayout->setSpacing(BitWidget::SPACING);
@@ -185,11 +184,10 @@ namespace Bloom::Widgets
             byteNumber--;
         }
 
+        bitsetSingleHorizontalLayout->addStretch(1);
         registerBitsetWidgetLayout->addLayout(bitsetSingleHorizontalLayout);
         registerBitsetWidgetLayout->addStretch(1);
 
-        this->registerHistoryWidget->setFixedHeight(this->contentContainer->sizeHint().height());
-
         QObject::connect(this->helpButton, &QPushButton::clicked, this, &TargetRegisterInspectorWindow::openHelpPage);
         QObject::connect(this->closeButton, &QPushButton::clicked, this, &QWidget::close);
         QObject::connect(
@@ -230,6 +228,12 @@ namespace Bloom::Widgets
         this->show();
     }
 
+    void TargetRegisterInspectorWindow::resizeEvent(QResizeEvent* event) {
+        this->container->setFixedSize(
+            this->width(),
+            this->height()
+        );
+    }
     bool TargetRegisterInspectorWindow::registerSupported(const Targets::TargetRegisterDescriptor& descriptor) {
         return (descriptor.size > 0 && descriptor.size <= 8);
     }
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/TargetRegisterInspectorWindow.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/TargetRegisterInspectorWindow.hpp
index 91f5b5db..4013adfc 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/TargetRegisterInspectorWindow.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/TargetRegisterInspectorWindow.hpp
@@ -37,6 +37,9 @@ namespace Bloom::Widgets
 
         void setValue(const Targets::TargetMemoryBuffer& registerValue);
 
+    protected:
+        void resizeEvent(QResizeEvent* event) override;
+
     private:
         Targets::TargetRegisterDescriptor registerDescriptor;
         Targets::TargetMemoryBuffer registerValue;