From ecbf482df8d1deb77adf8709d3f409342cf29c7d Mon Sep 17 00:00:00 2001 From: Nav Date: Wed, 6 Oct 2021 00:41:47 +0100 Subject: [PATCH] Tidying --- .../UserInterfaces/InsightWindow/InsightWindow.cpp | 2 -- .../UserInterfaces/InsightWindow/UiFiles/AboutWindow.ui | 3 +++ .../Widgets/ErrorDialogue/UiFiles/ErrorDialogue.ui | 3 +++ .../TargetRegistersPane/TargetRegistersPaneWidget.cpp | 8 -------- .../TargetRegistersPane/TargetRegistersPaneWidget.hpp | 9 --------- .../TargetWidgets/TargetPackageWidgetContainer.cpp | 4 +--- 6 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp b/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp index d2d4cdc7..80d376a7 100644 --- a/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp @@ -238,10 +238,8 @@ void InsightWindow::selectVariant(const TargetVariant* variant) { this->targetPackageWidget->height() + 450 ); - Logger::error("ressss"); this->adjustSize(); this->targetPackageWidget->show(); - } } diff --git a/src/Insight/UserInterfaces/InsightWindow/UiFiles/AboutWindow.ui b/src/Insight/UserInterfaces/InsightWindow/UiFiles/AboutWindow.ui index 5662ca5a..106e9d47 100644 --- a/src/Insight/UserInterfaces/InsightWindow/UiFiles/AboutWindow.ui +++ b/src/Insight/UserInterfaces/InsightWindow/UiFiles/AboutWindow.ui @@ -63,6 +63,9 @@ 7 + + QSizePolicy::Fixed + diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/UiFiles/ErrorDialogue.ui b/src/Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/UiFiles/ErrorDialogue.ui index 735297bf..bdeacec9 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/UiFiles/ErrorDialogue.ui +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/UiFiles/ErrorDialogue.ui @@ -22,6 +22,9 @@ 20 + + QSizePolicy::Fixed + diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp index 4661746b..e9c6daef 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp @@ -232,14 +232,6 @@ void TargetRegistersPaneWidget::refreshRegisterValues(std::optionalinsightWorker.queueTask(readRegisterTask); } -void TargetRegistersPaneWidget::clearInlineValues() { - for (const auto& registerGroupWidget : this->registerGroupWidgets) { - for (auto& [registerDescriptor, registerWidget] : registerGroupWidget->registerWidgetsMappedByDescriptor) { - registerWidget->clearInlineValue(); - } - } -} - void TargetRegistersPaneWidget::activate() { this->show(); this->activated = true; diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.hpp index 820cb388..73c5d681 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.hpp @@ -64,20 +64,11 @@ namespace Bloom::Widgets PanelWidget *parent ); - [[nodiscard]] QSize minimumSizeHint() const override { - return this->parent->size(); - } - - [[nodiscard]] QSize sizeHint() const override { - return this->minimumSizeHint(); - } - void filterRegisters(const QString& keyword); void collapseAllRegisterGroups(); void expandAllRegisterGroups(); void refreshRegisterValues(std::optional> callback = std::nullopt); - void clearInlineValues(); void activate(); void deactivate(); diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidgetContainer.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidgetContainer.cpp index 9d56c343..c070af18 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidgetContainer.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidgetContainer.cpp @@ -5,9 +5,7 @@ using namespace Bloom; using namespace Bloom::Widgets::InsightTargetWidgets; -TargetPackageWidgetContainer::TargetPackageWidgetContainer(QWidget* parent): QWidget(parent) { - this->packageWidget = this->findChild(); -} +TargetPackageWidgetContainer::TargetPackageWidgetContainer(QWidget* parent): QWidget(parent) {} void TargetPackageWidgetContainer::resizeEvent(QResizeEvent* event) { if (this->packageWidget == nullptr) {