From e9f6c50f352bb93b0f6e68c7ce7d8f8042f961ca Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Tue, 23 Aug 2022 22:04:00 +0100
Subject: [PATCH] Restored lh side bar and added an rh and bottom bar, in the
 memory inspection pane

---
 .../Stylesheets/InsightWindow.qss             |  25 ++-
 .../TargetMemoryInspectionPane.cpp            |   4 +-
 .../UiFiles/TargetMemoryInspectionPane.ui     | 142 +++++++++++++++++-
 3 files changed, 163 insertions(+), 8 deletions(-)

diff --git a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
index 6223a55e..4c6c37ac 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
+++ b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
@@ -288,7 +288,22 @@ QScrollBar::sub-line:vertical {
     border-bottom: 1px solid #41423f;
 }
 
-#target-memory-inspection-pane #top-bar QToolButton {
+#target-memory-inspection-pane #bottom-bar {
+    border-top: 1px solid #41423f;
+}
+
+#target-memory-inspection-pane #lh-side-bar {
+    border-right: 1px solid #41423f;
+}
+
+#target-memory-inspection-pane #rh-side-bar {
+    border-left: 1px solid #41423f;
+}
+
+#target-memory-inspection-pane #top-bar QToolButton,
+#target-memory-inspection-pane #bottom-bar QToolButton,
+#target-memory-inspection-pane #lh-side-bar QToolButton,
+#target-memory-inspection-pane #rh-side-bar QToolButton {
     background-color: transparent;
     border: none;
     padding: 0;
@@ -296,7 +311,10 @@ QScrollBar::sub-line:vertical {
     qproperty-buttonHeight: 20;
 }
 
-#target-memory-inspection-pane #top-bar QToolButton:hover {
+#target-memory-inspection-pane #top-bar QToolButton:hover,
+#target-memory-inspection-pane #bottom-bar QToolButton:hover,
+#target-memory-inspection-pane #lh-side-bar QToolButton:hover,
+#target-memory-inspection-pane #rh-side-bar QToolButton:hover {
     background-color: #454541;
     border: none;
 }
@@ -306,7 +324,8 @@ QScrollBar::sub-line:vertical {
     qproperty-buttonHeight: 21;
 }
 
-#target-memory-inspection-pane #top-bar #separator {
+#target-memory-inspection-pane #top-bar #separator,
+#target-memory-inspection-pane #bottom-bar #separator {
     background-color: transparent;
     border-right: 1px solid #41423f;
     padding: 0;
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp
index 88f55f35..c9af6332 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp
@@ -65,7 +65,7 @@ namespace Bloom::Widgets
         // Quick sanity check to ensure the validity of persisted settings.
         this->sanitiseSettings();
 
-        auto* containerLayout = this->container->findChild<QVBoxLayout*>("container-layout");
+        auto* containerLayout = this->container->findChild<QHBoxLayout*>("container-sub-layout");
         this->manageMemoryRegionsButton = this->container->findChild<SvgToolButton*>("manage-memory-regions-btn");
 
         this->refreshButton = this->container->findChild<SvgToolButton*>("refresh-memory-btn");
@@ -85,7 +85,7 @@ namespace Bloom::Widgets
         );
         this->hexViewerWidget->setDisabled(true);
 
-        containerLayout->addWidget(this->hexViewerWidget);
+        containerLayout->insertWidget(1, this->hexViewerWidget);
 
         this->setRefreshOnTargetStopEnabled(this->settings.refreshOnTargetStop);
         this->setRefreshOnActivationEnabled(this->settings.refreshOnActivation);
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui
index f70725cf..6a54da5a 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui
@@ -82,9 +82,6 @@
                                 </property>
                             </widget>
                         </item>
-                        <item>
-                            <widget class="QFrame" name="separator"/>
-                        </item>
                         <item>
                             <widget class="SvgToolButton" name="refresh-memory-btn">
                                 <property name="svgFilePath">
@@ -175,6 +172,145 @@
                     </layout>
                 </widget>
             </item>
+            <item>
+                <layout class="QHBoxLayout" name="container-sub-layout">
+                    <property name="spacing">
+                        <number>0</number>
+                    </property>
+                    <property name="margin">
+                        <number>0</number>
+                    </property>
+                    <item alignment="Qt::AlignLeft">
+                        <widget class="QWidget" name="lh-side-bar">
+                            <property name="minimumWidth">
+                                <number>30</number>
+                            </property>
+                            <property name="maximumWidth">
+                                <number>30</number>
+                            </property>
+                            <property name="sizePolicy">
+                                <sizepolicy hsizetype="Fixed" vsizetype="Expanding"/>
+                            </property>
+                            <layout class="QVBoxLayout" name="lh-side-bar-layout">
+                                <property name="spacing">
+                                    <number>3</number>
+                                </property>
+                                <property name="margin">
+                                    <number>0</number>
+                                </property>
+                                <item>
+                                    <spacer name="vertical-spacer">
+                                        <property name="sizeHint">
+                                            <size>
+                                                <height>3</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                </item>
+                                <!-- Button items here -->
+                                <item>
+                                    <spacer name="vertical-spacer">
+                                        <property name="orientation">
+                                            <enum>Qt::Vertical</enum>
+                                        </property>
+                                    </spacer>
+                                </item>
+                            </layout>
+                        </widget>
+                    </item>
+                    <item alignment="Qt::AlignLeft">
+                        <widget class="QWidget" name="rh-side-bar">
+                            <property name="minimumWidth">
+                                <number>30</number>
+                            </property>
+                            <property name="maximumWidth">
+                                <number>30</number>
+                            </property>
+                            <property name="sizePolicy">
+                                <sizepolicy hsizetype="Fixed" vsizetype="Expanding"/>
+                            </property>
+                            <layout class="QVBoxLayout" name="rh-side-bar-layout">
+                                <property name="spacing">
+                                    <number>3</number>
+                                </property>
+                                <property name="margin">
+                                    <number>0</number>
+                                </property>
+                                <item>
+                                    <spacer name="vertical-spacer">
+                                        <property name="sizeHint">
+                                            <size>
+                                                <height>3</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                </item>
+                                <!-- Button items here -->
+                                <item>
+                                    <spacer name="vertical-spacer">
+                                        <property name="orientation">
+                                            <enum>Qt::Vertical</enum>
+                                        </property>
+                                    </spacer>
+                                </item>
+                            </layout>
+                        </widget>
+                    </item>
+                </layout>
+            </item>
+            <item>
+                <widget class="QWidget" name="bottom-bar">
+                    <property name="minimumHeight">
+                        <number>28</number>
+                    </property>
+                    <property name="maximumHeight">
+                        <number>28</number>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"/>
+                    </property>
+                    <layout class="QHBoxLayout">
+                        <property name="spacing">
+                            <number>3</number>
+                        </property>
+                        <property name="margin">
+                            <number>0</number>
+                        </property>
+                        <item>
+                            <spacer name="horizontal-spacer">
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>5</width>
+                                    </size>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>QSizePolicy::Fixed</enum>
+                                </property>
+                            </spacer>
+                        </item>
+                       <!-- Button items here -->
+                        <item>
+                            <spacer name="horizontal-spacer">
+                                <property name="orientation">
+                                    <enum>Qt::Horizontal</enum>
+                                </property>
+                            </spacer>
+                        </item>
+                        <item>
+                            <spacer name="horizontal-spacer">
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>5</width>
+                                    </size>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>QSizePolicy::Fixed</enum>
+                                </property>
+                            </spacer>
+                        </item>
+                    </layout>
+                </widget>
+            </item>
         </layout>
     </widget>
 </ui>