diff --git a/src/Insight/CMakeLists.txt b/src/Insight/CMakeLists.txt index 1fe05de1..4f95e6c6 100755 --- a/src/Insight/CMakeLists.txt +++ b/src/Insight/CMakeLists.txt @@ -98,6 +98,8 @@ qt_add_resources( "./UserInterfaces/InsightWindow/Images/refresh.svg" "./UserInterfaces/InsightWindow/Images/refresh-disabled.svg" "./UserInterfaces/InsightWindow/Images/down-arrow.svg" + "./UserInterfaces/InsightWindow/Images/detach-pane-icon.svg" + "./UserInterfaces/InsightWindow/Images/attach-pane-icon.svg" "./UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/collapse-all.svg" "./UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/expand-all.svg" "./UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/arrow.svg" diff --git a/src/Insight/UserInterfaces/InsightWindow/Images/attach-pane-icon.svg b/src/Insight/UserInterfaces/InsightWindow/Images/attach-pane-icon.svg new file mode 100644 index 00000000..02ed1548 --- /dev/null +++ b/src/Insight/UserInterfaces/InsightWindow/Images/attach-pane-icon.svg @@ -0,0 +1,83 @@ + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/Insight/UserInterfaces/InsightWindow/Images/detach-pane-icon.svg b/src/Insight/UserInterfaces/InsightWindow/Images/detach-pane-icon.svg new file mode 100644 index 00000000..f184318f --- /dev/null +++ b/src/Insight/UserInterfaces/InsightWindow/Images/detach-pane-icon.svg @@ -0,0 +1,80 @@ + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss index f3014e23..438ce863 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss +++ b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss @@ -332,6 +332,10 @@ QScrollBar::sub-line:vertical { } /* Target Memory Inspection Pane */ +#target-memory-inspection-pane { + background-color: #373835; +} + #target-memory-inspection-pane #title-bar { background-color: #383F43; border-bottom: 1px solid #2F2F2D; @@ -345,7 +349,12 @@ QScrollBar::sub-line:vertical { border-right: 1px solid #41423f; } -#target-memory-inspection-pane #lh-side-bar QToolButton { +#target-memory-inspection-pane #rh-side-bar { + border-left: 1px solid #41423f; +} + +#target-memory-inspection-pane #lh-side-bar QToolButton, +#target-memory-inspection-pane #rh-side-bar QToolButton { background-color: transparent; border: none; padding: 0; @@ -353,7 +362,8 @@ QScrollBar::sub-line:vertical { qproperty-buttonHeight: 21; } -#target-memory-inspection-pane #lh-side-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; } @@ -464,3 +474,9 @@ QScrollBar::sub-line:vertical { #hex-viewer-container #graphics-view-container #address-container QLabel:disabled { color: rgba(175, 177, 179, 0.3); } + +#hex-viewer-container QScrollBar:vertical { + background-color: transparent; + width: 12px; + margin: 1px 3px 1px 0px; +} diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp index 5606e3f2..3500a7bb 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp @@ -59,6 +59,8 @@ namespace Bloom::Widgets auto* subContainerLayout = this->container->findChild("sub-container-layout"); this->manageMemoryRegionsButton = this->container->findChild("manage-memory-regions-btn"); + this->detachPaneButton = this->container->findChild("detach-pane-btn"); + this->attachPaneButton = this->container->findChild("attach-pane-btn"); this->hexViewerWidget = new HexViewerWidget( this->targetMemoryDescriptor, this->settings.hexViewerWidgetSettings, @@ -69,7 +71,7 @@ namespace Bloom::Widgets ); this->hexViewerWidget->setDisabled(true); - subContainerLayout->addWidget(this->hexViewerWidget); + subContainerLayout->insertWidget(1, this->hexViewerWidget); QObject::connect( this->manageMemoryRegionsButton, diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.hpp index 4f80fc4e..519bae28 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.hpp @@ -50,6 +50,8 @@ namespace Bloom::Widgets QWidget* titleBar = nullptr; SvgToolButton* manageMemoryRegionsButton = nullptr; + SvgToolButton* detachPaneButton = nullptr; + SvgToolButton* attachPaneButton = nullptr; HexViewerWidget* hexViewerWidget = nullptr; Targets::TargetState targetState = Targets::TargetState::UNKNOWN; diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui index 9ab77f4c..9bfe000b 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui @@ -94,6 +94,66 @@ + + + + 30 + + + 30 + + + + + + + 3 + + + 2 + + + + + + 3 + + + + + + + + :/compiled/src/Insight/UserInterfaces/InsightWindow/Images/detach-pane-icon.svg + + + Detach Pane + + + + + + + :/compiled/src/Insight/UserInterfaces/InsightWindow/Images/attach-pane-icon.svg + + + Attach Pane + + + false + + + + + + + Qt::Vertical + + + + + +