Removed fixed window size for the register inspection window
This commit is contained in:
@@ -29,6 +29,8 @@ namespace Bloom::Widgets
|
|||||||
this->setObjectName("target-register-history-widget");
|
this->setObjectName("target-register-history-widget");
|
||||||
this->setFixedWidth(300);
|
this->setFixedWidth(300);
|
||||||
|
|
||||||
|
this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
|
||||||
|
|
||||||
auto widgetUiFile = QFile(
|
auto widgetUiFile = QFile(
|
||||||
QString::fromStdString(Paths::compiledResourcesPath()
|
QString::fromStdString(Paths::compiledResourcesPath()
|
||||||
+ "/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget"
|
+ "/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget"
|
||||||
@@ -42,7 +44,7 @@ namespace Bloom::Widgets
|
|||||||
|
|
||||||
auto uiLoader = UiLoader(this);
|
auto uiLoader = UiLoader(this);
|
||||||
this->container = uiLoader.load(&widgetUiFile, this);
|
this->container = uiLoader.load(&widgetUiFile, this);
|
||||||
this->container->setFixedSize(this->size());
|
this->container->setMinimumSize(this->size());
|
||||||
this->container->setContentsMargins(1, 1, 1, 1);
|
this->container->setContentsMargins(1, 1, 1, 1);
|
||||||
|
|
||||||
this->itemContainer = this->container->findChild<QWidget*>("item-container");
|
this->itemContainer = this->container->findChild<QWidget*>("item-container");
|
||||||
@@ -104,7 +106,7 @@ namespace Bloom::Widgets
|
|||||||
}
|
}
|
||||||
|
|
||||||
void RegisterHistoryWidget::resizeEvent(QResizeEvent* event) {
|
void RegisterHistoryWidget::resizeEvent(QResizeEvent* event) {
|
||||||
this->container->setFixedSize(
|
this->container->setMinimumSize(
|
||||||
this->width(),
|
this->width(),
|
||||||
this->height()
|
this->height()
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<ui version="4.0">
|
<ui version="4.0">
|
||||||
<widget class="QWidget" name="container">
|
<widget class="QWidget" name="container">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"/>
|
||||||
|
</property>
|
||||||
<layout class="QVBoxLayout">
|
<layout class="QVBoxLayout">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
@@ -8,7 +11,7 @@
|
|||||||
<property name="margin">
|
<property name="margin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item alignment="Qt::AlignCenter">
|
<item>
|
||||||
<widget class="QWidget" name="title-bar">
|
<widget class="QWidget" name="title-bar">
|
||||||
<property name="minimumHeight">
|
<property name="minimumHeight">
|
||||||
<number>30</number>
|
<number>30</number>
|
||||||
@@ -18,7 +21,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item alignment="Qt::AlignTop">
|
<item>
|
||||||
<widget class="ExpandingHeightScrollAreaWidget" name="item-scroll-area">
|
<widget class="ExpandingHeightScrollAreaWidget" name="item-scroll-area">
|
||||||
<property name="widgetResizable"><bool>true</bool></property>
|
<property name="widgetResizable"><bool>true</bool></property>
|
||||||
<property name="verticalScrollBarPolicy"><enum>Qt::ScrollBarAsNeeded</enum></property>
|
<property name="verticalScrollBarPolicy"><enum>Qt::ScrollBarAsNeeded</enum></property>
|
||||||
|
|||||||
@@ -72,12 +72,12 @@ namespace Bloom::Widgets
|
|||||||
auto containerMargins = QMargins(15, 30, 15, 10);
|
auto containerMargins = QMargins(15, 30, 15, 10);
|
||||||
|
|
||||||
this->setStyleSheet(windowStylesheet.readAll());
|
this->setStyleSheet(windowStylesheet.readAll());
|
||||||
this->setFixedSize(windowSize);
|
this->setMinimumSize(windowSize);
|
||||||
|
|
||||||
auto uiLoader = UiLoader(this);
|
auto uiLoader = UiLoader(this);
|
||||||
this->container = uiLoader.load(&windowUiFile, this);
|
this->container = uiLoader.load(&windowUiFile, this);
|
||||||
|
|
||||||
this->container->setFixedSize(this->size());
|
this->container->setMinimumSize(this->size());
|
||||||
this->container->setContentsMargins(containerMargins);
|
this->container->setContentsMargins(containerMargins);
|
||||||
|
|
||||||
this->registerNameLabel = this->container->findChild<QLabel*>("register-name");
|
this->registerNameLabel = this->container->findChild<QLabel*>("register-name");
|
||||||
@@ -132,8 +132,6 @@ namespace Bloom::Widgets
|
|||||||
"0x" + QString::number(this->registerDescriptor.startAddress.value(), 16).toUpper()
|
"0x" + QString::number(this->registerDescriptor.startAddress.value(), 16).toUpper()
|
||||||
);
|
);
|
||||||
|
|
||||||
this->registerValueTextInput->setFixedWidth(BitsetWidget::WIDTH * 2);
|
|
||||||
|
|
||||||
if (!this->registerDescriptor.writable) {
|
if (!this->registerDescriptor.writable) {
|
||||||
this->registerValueTextInput->setDisabled(true);
|
this->registerValueTextInput->setDisabled(true);
|
||||||
this->applyButton->setVisible(false);
|
this->applyButton->setVisible(false);
|
||||||
@@ -176,6 +174,7 @@ namespace Bloom::Widgets
|
|||||||
this->bitsetWidgets.push_back(bitsetWidget);
|
this->bitsetWidgets.push_back(bitsetWidget);
|
||||||
|
|
||||||
if (((registerByteIndex + 1) % 2) == 0) {
|
if (((registerByteIndex + 1) % 2) == 0) {
|
||||||
|
bitsetSingleHorizontalLayout->addStretch(1);
|
||||||
registerBitsetWidgetLayout->addLayout(bitsetSingleHorizontalLayout);
|
registerBitsetWidgetLayout->addLayout(bitsetSingleHorizontalLayout);
|
||||||
bitsetSingleHorizontalLayout = new QHBoxLayout();
|
bitsetSingleHorizontalLayout = new QHBoxLayout();
|
||||||
bitsetSingleHorizontalLayout->setSpacing(BitWidget::SPACING);
|
bitsetSingleHorizontalLayout->setSpacing(BitWidget::SPACING);
|
||||||
@@ -185,11 +184,10 @@ namespace Bloom::Widgets
|
|||||||
byteNumber--;
|
byteNumber--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bitsetSingleHorizontalLayout->addStretch(1);
|
||||||
registerBitsetWidgetLayout->addLayout(bitsetSingleHorizontalLayout);
|
registerBitsetWidgetLayout->addLayout(bitsetSingleHorizontalLayout);
|
||||||
registerBitsetWidgetLayout->addStretch(1);
|
registerBitsetWidgetLayout->addStretch(1);
|
||||||
|
|
||||||
this->registerHistoryWidget->setFixedHeight(this->contentContainer->sizeHint().height());
|
|
||||||
|
|
||||||
QObject::connect(this->helpButton, &QPushButton::clicked, this, &TargetRegisterInspectorWindow::openHelpPage);
|
QObject::connect(this->helpButton, &QPushButton::clicked, this, &TargetRegisterInspectorWindow::openHelpPage);
|
||||||
QObject::connect(this->closeButton, &QPushButton::clicked, this, &QWidget::close);
|
QObject::connect(this->closeButton, &QPushButton::clicked, this, &QWidget::close);
|
||||||
QObject::connect(
|
QObject::connect(
|
||||||
@@ -230,6 +228,12 @@ namespace Bloom::Widgets
|
|||||||
this->show();
|
this->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TargetRegisterInspectorWindow::resizeEvent(QResizeEvent* event) {
|
||||||
|
this->container->setFixedSize(
|
||||||
|
this->width(),
|
||||||
|
this->height()
|
||||||
|
);
|
||||||
|
}
|
||||||
bool TargetRegisterInspectorWindow::registerSupported(const Targets::TargetRegisterDescriptor& descriptor) {
|
bool TargetRegisterInspectorWindow::registerSupported(const Targets::TargetRegisterDescriptor& descriptor) {
|
||||||
return (descriptor.size > 0 && descriptor.size <= 8);
|
return (descriptor.size > 0 && descriptor.size <= 8);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,6 +37,9 @@ namespace Bloom::Widgets
|
|||||||
|
|
||||||
void setValue(const Targets::TargetMemoryBuffer& registerValue);
|
void setValue(const Targets::TargetMemoryBuffer& registerValue);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void resizeEvent(QResizeEvent* event) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Targets::TargetRegisterDescriptor registerDescriptor;
|
Targets::TargetRegisterDescriptor registerDescriptor;
|
||||||
Targets::TargetMemoryBuffer registerValue;
|
Targets::TargetMemoryBuffer registerValue;
|
||||||
|
|||||||
Reference in New Issue
Block a user