doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed pointless container in HexViewerWidget and tidied QSS styles

Browse Source
This commit is contained in:
Nav
2022-12-29 18:50:01 +00:00
parent b2e20b8c1d
commit f41e60d0af
4 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.cpp
View File

@@ -46,6 +46,8 @@ namespace Bloom::Widgets
this->container->setFixedSize(this->size());
this->container->setContentsMargins(0, 0, 0, 0);
auto* containerLayout = this->container->findChild<QVBoxLayout*>("hex-viewer-layout");
this->toolBar = this->container->findChild<QWidget*>("tool-bar");
this->bottomBar = this->container->findChild<QWidget*>("bottom-bar");
@@ -72,7 +74,6 @@ namespace Bloom::Widgets
this->hoveredAddressLabel = this->bottomBar->findChild<Label*>("byte-address-label");
this->loadingHexViewerLabel = this->container->findChild<Label*>("loading-hex-viewer-label");
this->byteItemGraphicsViewContainer = this->container->findChild<QWidget*>("graphics-view-container");
this->byteItemGraphicsView = new ByteItemContainerGraphicsView(
this->targetMemoryDescriptor,
@@ -80,9 +81,11 @@ namespace Bloom::Widgets
this->excludedMemoryRegions,
this->settings,
this->hoveredAddressLabel,
this->byteItemGraphicsViewContainer
this->container
);
containerLayout->insertWidget(2, this->byteItemGraphicsView);
this->setHoveredRowAndColumnHighlightingEnabled(this->settings.highlightHoveredRowAndCol);
this->setFocusedMemoryHighlightingEnabled(this->settings.highlightFocusedMemory);
this->setAnnotationsEnabled(this->settings.displayAnnotations);
@@ -174,8 +177,7 @@ namespace Bloom::Widgets
[this] {
this->byteItemGraphicsScene = this->byteItemGraphicsView->getScene();
this->loadingHexViewerLabel->hide();
this->byteItemGraphicsViewContainer->show();
this->byteItemGraphicsView->setFixedSize(this->byteItemGraphicsViewContainer->size());
this->byteItemGraphicsView->show();
emit this->ready();
}
@@ -207,12 +209,10 @@ namespace Bloom::Widgets
this->width(),
this->height()
);
this->byteItemGraphicsView->setFixedSize(this->byteItemGraphicsViewContainer->size());
}
void HexViewerWidget::showEvent(QShowEvent* event) {
this->byteItemGraphicsView->setFixedSize(this->byteItemGraphicsViewContainer->size());
QWidget::showEvent(event);
}
void HexViewerWidget::onTargetStateChanged(Targets::TargetState newState) {

1
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.hpp
View File

@@ -58,7 +58,6 @@ namespace Bloom::Widgets
QWidget* bottomBar = nullptr;
Label* loadingHexViewerLabel = nullptr;
QWidget* byteItemGraphicsViewContainer = nullptr;
ByteItemContainerGraphicsView* byteItemGraphicsView = nullptr;
ByteItemGraphicsScene* byteItemGraphicsScene = nullptr;
Label* hoveredAddressLabel = nullptr;

12
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<widget class="QWidget" name="hex-viewer-container">
<layout class="QVBoxLayout">
<layout class="QVBoxLayout" name="hex-viewer-layout">
<property name="spacing">
<number>0</number>
</property>
@@ -194,16 +194,6 @@
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="graphics-view-container">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"/>
</property>
<property name="visible">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="bottom-bar">
<property name="minimumHeight">