diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-06-12 14:36:18 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-06-12 12:08:42 +0000 |
commit | c39d3e96e6e8725207eda830b9b5660bd2783a3e (patch) | |
tree | 0fea7da8d9fa1a43834eae0874f9935c3a390d24 /src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp | |
parent | 29e1fcfba128b1af20a67a02148a34e163b2d5b9 (diff) |
Fix datainput type issuesv2.0.0-rc2v2.0.0
- When adding a new data input the type is set correctly even if you
don't touch the type combo.
- When adding a new data input from popup menu for property, timeline,
or slide panel, the corresponding data input is not changed if the
new data input is of unsuitable type.
- Correct default type is shown for each property when setting data
input from inspector panel.
Task-number: QT3DS-1913
Change-Id: I704cb704fb1ec9aca916ed7f7542ace404bba77c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp')
-rw-r--r-- | src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); |