diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-11-01 15:38:49 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-11-01 15:38:49 +0100 |
| commit | b402f3548126a7616deff42110bb8fb915b1c75e (patch) | |
| tree | ffb3ef2955e8279890666063fa4e2df4eac9f06c /share/qtcreator/qmldesigner/itemLibraryQmlSources | |
| parent | de88d1c437b8c43428921738244b0ad4d006f4d9 (diff) | |
| parent | 02f7c9c3eb290bbd362349dab684606ad93b6e60 (diff) | |
| download | qt-creator-b402f3548126a7616deff42110bb8fb915b1c75e.tar.gz | |
Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
src/plugins/qmldesigner/designercore/model/abstractview.cpp
src/plugins/qmldesigner/designercore/model/import.cpp
src/plugins/qmldesigner/designercore/model/model_p.h
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
src/plugins/qmlprojectmanager/qmlproject.cpp
Change-Id: I4236bf0da9306abf201f4679259e72dd7c1eddbe
Diffstat (limited to 'share/qtcreator/qmldesigner/itemLibraryQmlSources')
| -rw-r--r-- | share/qtcreator/qmldesigner/itemLibraryQmlSources/AssetsView.qml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/AssetsView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/AssetsView.qml index e1c017814d..77a784d92d 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/AssetsView.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/AssetsView.qml @@ -162,6 +162,7 @@ ScrollView { // TODO: experiment using ListView instead of ScrollView + Column readonly property string suffix: fileName.substr(-4) readonly property bool isFont: suffix === ".ttf" || suffix === ".otf" + readonly property bool isEffect: suffix === ".qep" property bool currFileSelected: false MouseArea { @@ -180,7 +181,7 @@ ScrollView { // TODO: experiment using ListView instead of ScrollView + Column allowTooltip = true } onPositionChanged: tooltipBackend.reposition() - onPressed: (mouse)=> { + onPressed: (mouse) => { forceActiveFocus() allowTooltip = false tooltipBackend.hideTooltip() @@ -212,7 +213,7 @@ ScrollView { // TODO: experiment using ListView instead of ScrollView + Column } } - onReleased: (mouse)=> { + onReleased: (mouse) => { allowTooltip = true if (mouse.button === Qt.LeftButton) { if (!(mouse.modifiers & Qt.ControlModifier)) @@ -222,6 +223,14 @@ ScrollView { // TODO: experiment using ListView instead of ScrollView + Column } } + onDoubleClicked: (mouse) => { + forceActiveFocus() + allowTooltip = false + tooltipBackend.hideTooltip() + if (mouse.button === Qt.LeftButton && isEffect) + rootView.openEffectMaker(filePath) + } + ToolTip { visible: !isFont && mouseArea.containsMouse && !contextMenu.visible text: filePath |