| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
When building against Qt 5.11.1, deleting the CMainFrame is apparently
no longer doable while handling the CMainFrame::closeEvent, as it will
queue a close event for the underlying QWindow. We need to perform
shutdown asynchronously from the close event.
Task-number: QT3DS-1922
Change-Id: I6e056fad60aa6d91eef8dcd4c147c6b47d80b220
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
| |
Change-Id: If6e63d9c9198e97027890d1854bab2bc4858ba17
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Avoids crash when trying to load such a presentation.
Task-number: QT3DS-1903
Change-Id: Ic0fdd00243aed2656df248901ebbc444d829dcdd
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1908
Change-Id: I9c855c905538920a7ef7cd75f49712a47298d4f3
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's still unclear what the actual issue was, but copying paintEvent
handling from about dialog, and making the dialog form more like
about dialog, i.e. adding a layout to the dialog and
setting one of the QLabels to have word wrap fixes the flickering.
The fact that word wrap makes a difference likely means
that the root cause is some Qt bug and this might break again when
Qt version changes.
Task-number: QT3DS-939
Change-Id: If75f5e1d9ed57e3f72b13209a9d5fe6878371b34
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's still unclear what the actual issue was, but copying paintEvent
handling from about dialog, and making the dialog form more like
about dialog, i.e. adding a layout to the dialog and
setting one of the QLabels to have word wrap fixes the flickering.
The fact that word wrap makes a difference likely means
that the root cause is some Qt bug and this might break again when
Qt version changes.
Since tutorial dialog didn't have QLabel originally, removed text
from checkbox and added a separate label for it.
Task-number: QT3DS-939
Change-Id: If39d73851c5f7095bf630d4fe46446b81b9b4100
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I18e816f45f02049068184a674816950545b00874
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1904
Change-Id: Ia4fec2598459923c5f8cc5c2cb28a67d409584af
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1901
Change-Id: I3c48b9dfbfefdb8f46636e7d3f38d3585241fe55
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix FOV equations. Also, fix case for FOV of 180 degrees where image
lighting map was used in wrong orientation. With this fix, the negative z
axis passes through the center of the lighting map, with edges of the image
wrapped around the scene, i.e. with default camera settings the center of
image is in the direction of camera. This holds true for both cases of FOV = 180 and
FOV < 180 degrees.
This fix must be replicated on runtime side for results to match.
Task-ID: QT3DS-154
Change-Id: I917f4f1897e59294aa369933fc9b10ae849952e6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
|
|
|
| |
This bug was caused by the parent commit.
Task-number: QT3DS-1892
Change-Id: I15fbe4580ba676968c65afbb61bdb50f4d31d4fe
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Task-number: QT3DS-1890
Change-Id: Ie12ce196ea283299c830fc938eb5e6840e0647b7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1891
Change-Id: Idff2c8650f32b03c7537396f33a2513edf2f104c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Check new component or group name uniqueness based on the original object
name, not based on default "Group" or "Component" that is temporarily
assigned to the newly created object.
Task-ID: QT3DS-1831
Change-Id: I23138f92cb573eca861d494403371795dfaeec1b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QML Sliders and combo boxes were really only ignoring hotkeys because
of arrow keys can be used to adjust them. However, arrows are no longer
used as global hotkeys since the nudge functionality has been removed.
It's unclear why QML toolbuttons were ever ignoring the hotkeys - only
key they seem to be responding to is space, and that still works
even if ignoreHotkeys is removed. Perhaps it worked differently in
Qt versions prior 5.11.
Task-number: QT3DS-445
Change-Id: I19d74a792d593355684f6794f377dc4c826d4733
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1889
Change-Id: Ie905b74d97590c0f08fea2555a5d14c807728436
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1882
Change-Id: Ia1e7c767bfdeb7763aa9fd7ce66ed418212957e2
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
| |
Currently only possible to drag-select keyframes from property rows
Task-number: QT3DS-1886
Change-Id: I6673e5ec52a73d48f0c9cd98abc7a53a63915ee0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In case of overlapping start and end handles, now choose the handle
depending on the click position relative to start of the bar.
Never select start handle if end time is zero.
Also allow adjusting the duration to actual zero instead of just very
close to it.
Task-number: QT3DS-1869
Change-Id: I57d06c6e70bb22fd320bcd01adf021a15f13caf6
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
| |
- Fixed some cases where snap doesn't work correctly
- Update snapping after row filtering happens
Task-number: QT3DS-1877
Change-Id: If92a7acef2772cade0d3140040e27c5515fadb03
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I589da726cdf103d60ed18bf5dab27d745e6ad24e
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1857
Task-number: QT3DS-1858
Change-Id: Ie86ab9464709a907b1e04eca4e9161929a643527
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
| |
When pressing Escape key while DnD is active, it is cancelled
Task-number: QT3DS-1842
Change-Id: I74fd371844617757fcdc22603cf4cf5605fe1c33
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1855
Change-Id: I8173829e093a3ca772306ced7ad46bda30e09b88
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
| |
Change-Id: I1279e89703ee9fec80c6127d11a242384066cb46
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
|
|
|
|
|
|
|
|
|
| |
This works around QTBUG-61678, where the blank cursor gets corrupted
in multimonitor setups. Use a custom empty bitmap cursor instead.
Change-Id: I629265663ec5a6074e5e58ab978dc607fae735c8
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Install an event filter that blocks all mouse button events for other
buttons than the left button for the duration of the drag. Key events
and shortcut overrides are also blocked.
Task-number: QT3DS-565
Change-Id: Idbc03eae5e4e4e0718ebdd43066f58275bd5f44f
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
Need to check for slide validity before attempting to change to it.
Task-number: QT3DS-1750
Change-Id: I77e93f8f8398169dd9ebf54a8fb281b16407d055
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Stop slider rate-limiting timer when user releases mouse button and value
is committed to property system, to prevent timer triggering an unnecessary
non-committing property change. Instead at button release just update the
associated text field to reflect the committed value.
Change-Id: Ia0587b1fa1c3860b0d07bd653d91e7dc2240c293
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Updating the return slide when the slide change was caused by the
engine rather than user would update the return slide to the master
slide itself. Changed it so that the return slide is updated every
time we change to non-master slide.
Task-number: QT3DS-1750
Change-Id: I105d2996265cc152782f8b1ec9fb9a5f02adf4b3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Remove unused controls from Authoring/Studio/Controls and some
ancillary files elsewhere.
Task-number: QT3DS-1828
Change-Id: I6461112a02cc24ef0c169b3a99de26b034065040
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are two problems with the shadows.
1. The shader cache key for default materials is not properly initialized,
which causes invalid shader being used for the material.
2. Custom material shadow cubes and maps uniforms are not set correctly.
Only first element in those sampler arrays were set, so when custom material
lighting had more then 1 light and shadows, only one light affected the
rendered result.
Fixed the default material key and implemented proper setters for sampler
uniforms.
Task-number: QT3DS-1824
Change-Id: I0b97a4642410f37011392adf1020bc1d2bd21bb3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
| |
Icons were a bit blurry, change layer icon and use 16x16 which is
native resolution of all these toolbar icons.
Change-Id: I9c869c5c86cd91a190ba59eb04c3d67ad266007c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove unused files and unused functionality from remaining files.
Moved some still used functionality to better places.
It is likely that a lot of unnecessary code still remains.
Task-number: QT3DS-1828
Change-Id: I199f67e7d34acbc4d707b75502a4b54e0f9a7d02
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1832
Change-Id: I35d75928fe49a82609801d7f2a7581482921d9d1
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
| |
Task-number: QT3DS-1748
Change-Id: Iea9fd71c3c2ff1dc1cfa0d6b083ca4b90b76a89d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I0525cb2cdf9cc0594a83150b6cb4a9c42442313d
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
| |
Change-Id: I39762c08eb326afe166b3c474362fe542a1f892a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Allow updating duration and maxDuration separately. Max duration
is not updated during manual duration movement to avoid buggy behavior
when adjusting right-most duration.
- Draw ruler up to maxDuration and with active color up to duration.
- Fix ruler update after undo/redo.
Task-number: QT3DS-1789
Change-Id: I66e45aeda7e9aa5e91e7de6092d05a1d52f1c89b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
We can't rely Image element's sourceSize, as it can change when
pixelratio changes and @2x images are used. Now we hardcode space taken
by the image.
Change-Id: I62faeca8dd3ae22dc42af2ada593ba4dee7194d8
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Get current display scaling factor when render rectangle changes size.
Fixes incorrect mouse click coordinate mapping after rescaling (Studio
window moved from one monitor to another, for example).
Change-Id: Id9d82775e9c11fac308085b0a7891dfa610e8d05
Task-Id: QT3DS-1673
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1821
Change-Id: Ibbb8f56faec76c14eca54fc7d3414f1d18129119
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Context menu no longer opens when drag is happening.
- Non-left button presses are ignored while drag is happening, as those
caused hover events to trigger.
- Non-left doubleclicks do not trigger any special handling.
- Non-left click + mouse move no longer can mistakenly modify
m_dragging.
Task-number: QT3DS-1817
Change-Id: I2ea0353ad45b7567b5e23ac22ceda7707d6b5de0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
| |
Start time, end time, and duration are shown for the dragged bar
Task-number: QT3DS-401
Change-Id: I6da60ca08579086d778d052015b18f37adaf34b7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Binds the newly created datainput directly as controller for slide or
timeline, when datainput is created using "Add New Data Input" from
datainput selector dialog. Also, use appropriate window titles.
Change-Id: I288286d11f8a22f5a4d97183067c8e1412ba6002
Task-Id: QT3DS-1538
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Implements datainput usage tracking in order for UI to have access to
up-to-date binding information when needed. Highlights datainputs that are
currently bound in the datainput definition dialog. Shows "no undo" warning
when a datainput is deleted.
Task-ID: QT3DS-1659
Change-Id: I13d2bc1131ce6a1c78166f295291fc107395a247
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|