diff options
Diffstat (limited to 'src/Authoring/Studio/Palettes')
3 files changed, 7 insertions, 4 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp index 671a0f76..54ebf193 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp @@ -488,7 +488,8 @@ QObject *InspectorControlView::showObjectReference(int handle, int instance, con QObject *InspectorControlView::showDataInputChooser(int handle, int instance, const QPoint &point) { if (!m_dataInputChooserView) { - m_dataInputChooserView = new DataInputSelectView(this); + const QVector<EDataType> acceptedTypes; + m_dataInputChooserView = new DataInputSelectView(acceptedTypes); connect(m_dataInputChooserView, &DataInputSelectView::dataInputChanged, this, [this](int handle, int instance, const QString &controllerName) { bool controlled = @@ -511,7 +512,7 @@ QObject *InspectorControlView::showDataInputChooser(int handle, int instance, co if (CDataInputDlg::isEquivalentDataType(it->type, dataType)) dataInputList.append(QPair<QString, int>(it->name, it->type)); } - + m_dataInputChooserView->setAcceptedTypes(CDataInputDlg::getAcceptedTypes(dataType)); m_dataInputChooserView-> setData(dataInputList, m_inspectorControlModel->currentControllerValue(instance, handle), diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp index 47fb154b..fd1a31bd 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp +++ b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp @@ -384,7 +384,8 @@ void SlideView::initialize() engine()->addImportPath(qmlImportPath()); setSource(QUrl("qrc:/Palettes/Slide/SlideView.qml"_L1)); - m_dataInputSelector = new DataInputSelectView(this, EDataType::DataTypeString); + const QVector<EDataType> acceptedTypes = { EDataType::DataTypeString }; + m_dataInputSelector = new DataInputSelectView(acceptedTypes, this); connect(m_dataInputSelector, &DataInputSelectView::dataInputChanged, this, &SlideView::onDataInputChange); } diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp index 8c4de2e4..12edb43e 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp @@ -146,7 +146,8 @@ TimelineToolbar::TimelineToolbar() : QToolBar() std::bind(&TimelineToolbar::onSelectionChange, this, std::placeholders::_1)); // make datainput indicator listen to selection dialog choice - m_dataInputSelector = new DataInputSelectView(this, EDataType::DataTypeRangedNumber); + const QVector<EDataType> acceptedTypes = { EDataType::DataTypeRangedNumber }; + m_dataInputSelector = new DataInputSelectView(acceptedTypes, this); g_StudioApp.GetCore()->GetDispatch()->AddDataModelListener(this); connect(m_dataInputSelector, &DataInputSelectView::dataInputChanged, this, &TimelineToolbar::onDataInputChange); |