mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 09:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash when only one window is available; Make OpenSpace link again when using Qt6

Browse Source
This commit is contained in:
Alexander Bock
2022-04-25 17:48:58 +02:00
parent 7d1badbffd
commit 0a8523a14c
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSpace/ext/launcher/CMakeLists.txt
+1 -1
View File
@@ -98,7 +98,7 @@ elseif (${QT_VERSION_MAJOR} EQUAL 6)
qt6_wrap_cpp(
MOC_FILES
${HEADER_SOURCE}
${HEADER_FILES}
)
qt6_add_resources(RESOURCE_FILES resources/resources.qrc)
elseif (NOT DEFINED QT_VERSION_MAJOR)
apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
-1
View File
@@ -277,7 +277,6 @@ sgct::config::Cluster SgctEdit::generateConfiguration() const {
window.tags.push_back("GUI");
window.draw2D = true;
window.draw3D = false;
window.isResizable = false;
}
cluster.nodes.push_back(node);
apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
+16 -16
View File
@@ -127,28 +127,28 @@ void WindowControl::createWidgets(const QColor& windowColor) {
_windowName->setToolTip(tip);
layout->addWidget(_windowName, 1, 1, 1, 7);
}
if (_monitorResolutions.size() > 1) {
QString tip = "The monitor where this window is located.";
QString tip = "The monitor where this window is located.";
_monitor = new QComboBox;
_monitor->addItems(monitorNames(_monitorResolutions));
_monitor->setCurrentIndex(_monitorIndexDefault);
_monitor->setToolTip(tip);
connect(
_monitor, qOverload<int>(&QComboBox::currentIndexChanged),
[this]() {
emit windowChanged(
_monitor->currentIndex(),
_windowIndex,
_windowDimensions
);
}
);
if (_monitorResolutions.size() > 1) {
QLabel* labelLocation = new QLabel("Monitor");
labelLocation->setToolTip(tip);
layout->addWidget(labelLocation, 2, 0);
_monitor = new QComboBox;
_monitor->addItems(monitorNames(_monitorResolutions));
_monitor->setCurrentIndex(_monitorIndexDefault);
_monitor->setToolTip(tip);
layout->addWidget(_monitor, 2, 1, 1, 7);
connect(
_monitor, qOverload<int>(&QComboBox::currentIndexChanged),
[this]() {
emit windowChanged(
_monitor->currentIndex(),
_windowIndex,
_windowDimensions
);
}
);
}
{
QLabel* size = new QLabel("Size");