diff --git a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
index 9c65f957..dd535ac1 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
+++ b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
@@ -308,22 +308,22 @@ QScrollBar::sub-line:vertical {
}
#bottom-menu-bar #ram-inspection-btn {
- min-width: 71px;
+ min-width: 73px;
}
#bottom-menu-bar #eeprom-inspection-btn {
- min-width: 97px;
+ min-width: 99px;
}
#bottom-menu-bar #ram-inspection-btn #ram-inspection-btn-icon,
#bottom-menu-bar #eeprom-inspection-btn #eeprom-inspection-btn-icon {
- margin-left: 7px;
+ margin-left: 6px;
margin-top: 1px;
}
#bottom-menu-bar #ram-inspection-btn #ram-inspection-btn-label,
#bottom-menu-bar #eeprom-inspection-btn #eeprom-inspection-btn-label {
- margin-left: 1px;
+ margin-left: 5px;
}
#bottom-menu-bar QToolButton:hover,
diff --git a/src/Insight/UserInterfaces/InsightWindow/UiFiles/InsightWindow.ui b/src/Insight/UserInterfaces/InsightWindow/UiFiles/InsightWindow.ui
index 14a359de..e35fb8a3 100644
--- a/src/Insight/UserInterfaces/InsightWindow/UiFiles/InsightWindow.ui
+++ b/src/Insight/UserInterfaces/InsightWindow/UiFiles/InsightWindow.ui
@@ -320,7 +320,7 @@
22
- 22
+ 26
:/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon.svg
@@ -371,7 +371,7 @@
22
- 22
+ 26
:/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon.svg
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/SvgWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/SvgWidget.cpp
index d28fac60..bd9df271 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/SvgWidget.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/SvgWidget.cpp
@@ -6,9 +6,6 @@
using namespace Bloom::Widgets;
SvgWidget::SvgWidget(QWidget* parent): QFrame(parent) {
- this->containerWidth = parent->width();
- this->containerHeight = parent->height();
- this->setFixedSize(this->containerWidth, this->containerHeight);
this->renderer.setAspectRatioMode(Qt::AspectRatioMode::KeepAspectRatioByExpanding);
}
@@ -16,27 +13,25 @@ void SvgWidget::paintEvent(QPaintEvent* paintEvent) {
auto painter = QPainter(this);
auto svgSize = this->renderer.defaultSize();
auto margins = this->contentsMargins();
+ const auto containerSize = this->frameSize();
painter.setRenderHints(QPainter::RenderHint::Antialiasing | QPainter::RenderHint::SmoothPixmapTransform, true);
- this->setFixedHeight(this->containerHeight + margins.top() + margins.bottom());
- this->setFixedWidth(this->containerWidth + margins.left() + margins.right());
-
if (this->angle % 360 != 0) {
painter.translate(
- std::ceil(static_cast(this->containerWidth / 2)),
- std::ceil(static_cast(this->containerHeight / 2))
+ std::ceil(static_cast(containerSize.width() / 2)),
+ std::ceil(static_cast(containerSize.height() / 2))
);
painter.rotate(this->angle);
painter.translate(
- -std::ceil(static_cast(this->containerWidth / 2)),
- -std::ceil(static_cast(this->containerHeight / 2))
+ -std::ceil(static_cast(containerSize.width() / 2)),
+ -std::ceil(static_cast(containerSize.height() / 2))
);
}
this->renderer.render(&painter, QRectF(
- std::ceil(static_cast(this->containerWidth - svgSize.width()) / 2 + static_cast(margins.left())),
- std::ceil(static_cast(this->containerHeight - svgSize.height()) / 2 + static_cast(margins.top())),
+ std::ceil(static_cast(containerSize.width() - svgSize.width()) / 2 + static_cast(margins.left())),
+ std::ceil(static_cast(containerSize.height() - svgSize.height()) / 2 + static_cast(margins.top())),
svgSize.width(),
svgSize.height()
));
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/SvgWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/SvgWidget.hpp
index 315aec53..8860d249 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/SvgWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/SvgWidget.hpp
@@ -39,6 +39,7 @@ namespace Bloom::Widgets
void setContainerWidth(int containerWidth) {
this->containerWidth = containerWidth;
+ this->setFixedWidth(this->containerWidth);
}
[[nodiscard]] int getContainerWidth() const {
@@ -47,6 +48,7 @@ namespace Bloom::Widgets
void setContainerHeight(int containerHeight) {
this->containerHeight = containerHeight;
+ this->setFixedHeight(this->containerHeight);
}
[[nodiscard]] int getContainerHeight() const {