summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Switch to qt3dstudio/ogl-runtime submodulePasi Keränen2019-06-101-451/+0
| | | | | | | | Module config change so that ogl-runtime builds from submodule. Task-number: QT3DS-3600 Change-Id: Ib22fda6aed1cf9336f15b79256b5f9db8774159f Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Correct RowTree::rowType() for materialsMahmoud Badri2019-05-241-18/+11
| | | | | | | | | | | | RowTree::rowType() retuned OBJTYPE_MATERIAL for all types of materials. now it is fixed. Also code that uses it is updated. Additionally it is renamed to objectType() which is more matching with its purpose. Change-Id: Idaccc206ab053dbfad11a06469d60bd3adc73ad7 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Disallow modifying default material by dragging things on itMiikka Heikkinen2019-04-021-4/+6
| | | | | | | | Task-number: QT3DS-3245 Change-Id: I0ef73c495522311527fce221fb996bdcd953353e Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix persistent drag source row indicatorMiikka Heikkinen2019-03-281-1/+3
| | | | | | | Change-Id: Idf3706db17571241ec41f517d5bbfea914961063 Fixes: QT3DS-2306 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix master slide item grouping issuesv2.3.0-rc2Miikka Heikkinen2019-03-261-7/+12
| | | | | | | | | | | | Disallow grouping mixed non-master and master items. If master items are grouped, the resulting group is a master group. Disallow dragging master items under non-master items in some edge cases that still allowed it. Change-Id: Id4e18405526fb5b0f9ed17bc29e758101a19875e Fixes: QT3DS-3224 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Allow dropping on entire timeline row if insertion above is invalidMiikka Heikkinen2019-03-201-5/+22
| | | | | | | | | | This improves user experience when dragging things under scene or the topmost layer. Task-number: QT3DS-2652 Change-Id: I278504f1da14fa47941f8fa1b5d931b68b267958 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add DnD from project view to timeline for matsJere Tuliniemi2018-10-301-4/+14
| | | | | | | Task-number: QT3DS-2108 Change-Id: If193f23a73c0d107a817af834c32076cd72ae280 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Drag and drop images to the timelineMahmoud Badri2018-10-151-5/+27
| | | | | | | | | | - You can now drag images from the project palette to the timeline rows. Supported drop rows are layers, materials and images. - Relevant tweaks. Task-number: QT3DS-2267 Change-Id: I0646b47d31e38c89fe95461c7f2fb040a479b43e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add a 'Detach material' check box to the ChooseImagePropertyDlgMahmoud Badri2018-09-061-4/+4
| | | | | | | | | | | When setting a sub-presentation to a ref material, a new check box option appears in the ChooseImagePropertyDlg, if checked the ref material will be changed to a Standard material so that the sub-presentation setting only affects this material instance. Task-number: QT3DS-2233 Change-Id: Iafff41f6994715289b13c30acf1226a4dfe86d08 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow item(s) DnD to component directly from sceneJanne Kangas2018-08-301-2/+26
| | | | | | | | | | | Insert dragged items into a component and remove them from the current scene. The items are inserted into master slide for the component (with original start/end time values regardless of the time context change). Task-ID: QT3DS-706 Change-Id: I33d43900e42dcb407524e12ec7690457cd641081 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Autoexpand rows when dragging presentationsMiikka Heikkinen2018-08-221-1/+5
| | | | | | | Task-number: QT3DS-2101 Change-Id: Id39a40edc2c565e8e89b83c8caf2d0d931ff7962 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Allow DnD qml streams to timeline layer, material and texture rowsMahmoud Badri2018-08-171-3/+3
| | | | | | | | | | | - Allow DnD qml streams from the project palette to the timeline layer, material and texture rows to set sub-presentation for the row according to its type. - deleted 1 unused method. Task-number: QT3DS-2093 Change-Id: I4da1b315da0203cafec02783d3390991f233ecb7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow DnD presentations from the project palette to the timeline rowsMahmoud Badri2018-07-271-0/+24
| | | | | | | Task-number: QT3DS-1951 Change-Id: Iae861c2f777d8e62a17e2331aea1913390d05453 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Move colors from TimelineConstants to CStudioPreferencesMiikka Heikkinen2018-07-061-2/+3
| | | | | | | Task-number: QT3DS-1978 Change-Id: Ic3bb918e3f9f6c5b2d12f43aad7821a83c3cc657 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix some property graph expansion issuesMahmoud Badri2018-06-071-19/+9
| | | | | | | | | | | | | | | Fixed the following 2 issues which happen when one or more property rows graphs are expanded: - selecting keyframes by selection rectangle - tree rows context menu targeting the correct row Also got rid of the correctIndex() method (and some related methods) which caused some limitations. Task-number: QT3DS-1892 Change-Id: I64b817d54da4a471c0ada8e74a13b61b44f5820f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Handle trivial timeline TODOsMiikka Heikkinen2018-06-011-1/+1
| | | | | | | | | | | Went through timeline TODOs and removed ones that are no longer valid and did trivial ones. Task-number: QT3DS-1828 Change-Id: I717c4fae21bd2d95136c0cec63e4b304bbb3d24d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix some DnD insertion issuesMahmoud Badri2018-05-311-16/+36
| | | | | | | | | Fix some cases where the DnD insertion mark doesn't appear although the insertion position is valid. Task-number: QT3DS-1829 Change-Id: If6ca415158282a625e57cc0ae23a8c33bd518c5a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow moving rows at the root level inside a componentMahmoud Badri2018-05-301-4/+12
| | | | | | | Task-number: QT3DS-1821 Change-Id: Ibbb8f56faec76c14eca54fc7d3414f1d18129119 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Block dragging objects under locked objectsMiikka Heikkinen2018-05-301-1/+2
| | | | | | | Task-number: QT3DS-1798 Change-Id: Iceacd7b6290397ac41fdc3dc5adff97bd6bba53f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* implement DnD auto scroll, expand, and collapse functionalitiesMahmoud Badri2018-05-291-17/+58
| | | | | | | | | | | | | - While Dragging a row, hover over a container row and it will auto expand. Hover out of it and it will auto collapse. - Hover over the top or the bottom of the tree list and it will auto scroll. - While DnD is active, currently hovered row is highlighted so that auto expand/collapse is more clear. Task-number: QT3DS-1711 Change-Id: I00680bb9e8b00530b257ca7a39a9789b7b040a5a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove some compile warningsMiikka Heikkinen2018-05-281-0/+3
| | | | | Change-Id: Icab92c578ec17331812fe3a1bc778bb8135692b2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Drag move and selection improvementsMiikka Heikkinen2018-05-181-83/+91
| | | | | | | | | | | | | | | - Allow moving multiselection - Disallow multiselection of layers, materials, scripts, and effects - Disallow moving materials at all - Disallow moving a single row so that it's place doesn't change - When dragging from external palette, show rowmover only when drop is valid. Task-number: QT3DS-1526 Task-number: QT3DS-1675 Change-Id: Iccdfbdeac4aeea07659e21cee9b36dc152ff48da Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Prevent dragging effects to non-layer objectsMahmoud Badri2018-05-171-12/+12
| | | | | | Task-number: QT3DS-1690 Change-Id: Iba806f878f933648f9620482d367375a67ded09b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Refactor row movingMiikka Heikkinen2018-05-161-31/+36
| | | | | | | | | | Use RearrangeRows instead of just moving a row based on index. This way we don't need to deal with row indexes at all, reducing risks related to calculating them incorrectly. Change-Id: Ida11b6b48c0809f7a80c361e8f9dd811ca3f5d0f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Forbid inserting master objects into non-master objectsMiikka Heikkinen2018-05-141-0/+3
| | | | | | | Task-number: QT3DS-1552 Change-Id: I26cd0d6efb591e435171d275685ecef335e5ec3d Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Prevent dragging rows under material rowsMahmoud Ali2018-05-111-54/+68
| | | | | | | | Also improve the row dragging mechanism. Task-number: QT3DS-1550 Change-Id: I43b9c3d2d99d8c456f8efcad59a24f63e4c3467f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow moving a row under a collapsed rowMahmoud Ali2018-05-111-7/+10
| | | | | | | | Also remove GV from the timeline title Task-number: QT3DS-1548 Change-Id: I5daf2e70be8e28fc3070f7032a3d443c321a0c19 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Support drag&drop objects into timelineMahmoud Badri2018-05-091-21/+135
| | | | | | | | | | Implement dragging items from the "Basic Objects" and project assets to the timeline tree part. Task-number: QT3DS-1455 Change-Id: Iafb58d647221c63dcaa5ac9cced3ab9ee8de2a68 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Rewrite the logic for adding/removing/moving rowsMahmoud Ali2018-04-301-13/+1
| | | | | | | | | | This fixes several issues and improve the timeline performance. Task-number: QT3DS-1496 Task-number: QT3DS-1493 Task-number: QT3DS-1476 Change-Id: I1e838d0107317abd6dc7267a8eb82fa56e076390 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Continue timeline workMahmoud Badri2018-03-191-8/+13
| | | | | | | | Split timeline and tree views, implement layer locking, filter rows, start connection to the app data mode. Task-number: QT3DS-1262 Change-Id: I54fb659e5c4f1103b8cf792b04bcaf012779cf1a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement graphics view based timeline basicsMahmoud Badri2018-02-281-0/+144
Add rows, reorder rows, keyframes Task-number: QT3DS-927 Change-Id: Iaff7354fd5d5b8feaa86364d1b545a48cc3c0376 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 12:07:22 +0000