diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h index c19f6698d1..ff77e681e4 100644 --- a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h +++ b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h @@ -158,6 +158,8 @@ private: QLabel* _labelComma = nullptr; QHBoxLayout* _layoutCheckboxesFull1 = nullptr; QVBoxLayout* _layoutCheckboxesFull2 = nullptr; + QVBoxLayout* _layoutProjectionGroup = nullptr; + QFrame* _borderProjectionGroup = nullptr; QHBoxLayout* _layoutFullscreenButton = nullptr; QHBoxLayout* _layoutCBoxWindowDecor = nullptr; QHBoxLayout* _layoutCBoxWebGui = nullptr; diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp index 0f31af0d37..67b745db43 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp @@ -145,18 +145,23 @@ QVBoxLayout* WindowControl::initializeLayout(QWidget* parentWidget) { _layoutCBoxWebGui->addWidget(_checkBoxWebGui); _layoutCBoxWebGui->addStretch(1); _layoutCheckboxesFull2->addLayout(_layoutCBoxWebGui); - _layoutCBoxSpoutOutput= new QHBoxLayout(); - _layoutCBoxSpoutOutput->addWidget(_checkBoxSpoutOutput); - _layoutCBoxSpoutOutput->addStretch(1); - _layoutCheckboxesFull2->addLayout(_layoutCBoxSpoutOutput); + _layoutProjectionGroup = new QVBoxLayout(); _layoutComboProjection = new QHBoxLayout(); _layoutComboProjection->addWidget(_comboProjection); _layoutComboProjection->addStretch(1); - _layoutCheckboxesFull2->addLayout(_layoutComboProjection); + _layoutProjectionGroup->addLayout(_layoutComboProjection); + _borderProjectionGroup = new QFrame; + _borderProjectionGroup->setFrameStyle(QFrame::StyledPanel | QFrame::Plain); + _borderProjectionGroup->setLayout(_layoutProjectionGroup); + _borderProjectionGroup->setVisible(true); + _layoutCBoxSpoutOutput= new QHBoxLayout(); + _layoutCBoxSpoutOutput->addWidget(_checkBoxSpoutOutput); + _layoutCBoxSpoutOutput->addStretch(1); + _layoutProjectionGroup->addLayout(_layoutCBoxSpoutOutput); _layoutComboQuality = new QHBoxLayout(); _layoutComboQuality->addWidget(_comboQuality); _layoutComboQuality->addStretch(1); - _layoutCheckboxesFull2->addLayout(_layoutComboQuality); + _layoutProjectionGroup->addLayout(_layoutComboQuality); _layoutFov = new QHBoxLayout(); _labelFov = new QLabel(); _labelFov->setText("Horizontal FOV:"); @@ -165,7 +170,7 @@ QVBoxLayout* WindowControl::initializeLayout(QWidget* parentWidget) { _layoutFov->addStretch(1); _layoutFovWrapper = new QWidget(); _layoutFovWrapper->setLayout(_layoutFov); - _layoutCheckboxesFull2->addWidget(_layoutFovWrapper); + _layoutProjectionGroup->addWidget(_layoutFovWrapper); _layoutHeightOffset = new QHBoxLayout(); _labelHeightOffset = new QLabel(); _labelHeightOffset->setText("Height Offset:"); @@ -174,7 +179,8 @@ QVBoxLayout* WindowControl::initializeLayout(QWidget* parentWidget) { _layoutHeightOffset->addStretch(1); _layoutHeightOffsetWrapper = new QWidget(); _layoutHeightOffsetWrapper->setLayout(_layoutHeightOffset); - _layoutCheckboxesFull2->addWidget(_layoutHeightOffsetWrapper); + _layoutProjectionGroup->addWidget(_layoutHeightOffsetWrapper); + _layoutCheckboxesFull2->addWidget(_borderProjectionGroup); _layoutCheckboxesFull1->addLayout(_layoutCheckboxesFull2); _layoutCheckboxesFull1->addStretch(1); _layoutWindowCtrl->addLayout(_layoutCheckboxesFull1); @@ -495,6 +501,8 @@ WindowControl::~WindowControl() delete _layoutFovWrapper; delete _layoutHeightOffset; delete _layoutHeightOffsetWrapper; + delete _layoutProjectionGroup; + delete _borderProjectionGroup; delete _layoutCheckboxesFull2; delete _layoutCheckboxesFull1; delete _layoutWinNum;