Differential D25428 Diff 71052 containments/desktop/package/contents/ui/FolderItemDelegate.qml

Changeset View

Standalone View

View Options

containments/desktop/package/contents/ui/FolderItemDelegate.qml

Show All 36 Lines30Item {
37 property QtObject popupDialog: loader.item ? loader.item.popupDialog : null 37​ property QtObject popupDialog: loader.item ? loader.item.popupDialog : null
38 property Item iconArea: loader.item ? loader.item.iconArea : null 38​ property Item iconArea: loader.item ? loader.item.iconArea : null
39 property Item label: loader.item ? loader.item.label : null 39​ property Item label: loader.item ? loader.item.label : null
40 property Item labelArea: loader.item ? loader.item.labelArea : null 40​ property Item labelArea: loader.item ? loader.item.labelArea : null
41 property Item actionsOverlay: loader.item ? loader.item.actionsOverlay : null 41​ property Item actionsOverlay: loader.item ? loader.item.actionsOverlay : null
42 property Item hoverArea: loader.item ? loader.item.hoverArea : null 42​ property Item hoverArea: loader.item ? loader.item.hoverArea : null
43 property Item frame: loader.item ? loader.item.frame : null 43​ property Item frame: loader.item ? loader.item.frame : null
44 property Item toolTip: loader.item ? loader.item.toolTip : null 44​ property Item toolTip: loader.item ? loader.item.toolTip : null
45​ property bool touchTap: false
46​ property bool tapAndHold: false
45 Accessible.name: name 47​ Accessible.name: name
46 Accessible.role: Accessible.Canvas 48​ Accessible.role: Accessible.Canvas
47 49​
48 function openPopup() { 50​ function openPopup() {
49 if (isDir) { 51​ if (isDir) {
50 loader.item.openPopup(); 52​ loader.item.openPopup();
51 } 53​ }
52 } 54​ }
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Line(s)86 Item {
153 PlasmaCore.ToolTipArea { 155​ PlasmaCore.ToolTipArea {
154 id: toolTip 156​ id: toolTip
155 157​
156 active: (plasmoid.configuration.toolTips && popupDialog == null && !model.blank) 158​ active: (plasmoid.configuration.toolTips && popupDialog == null && !model.blank)
157 interactive: false 159​ interactive: false
158 location: root.useListViewMode ? (plasmoid.location === PlasmaCore.Types.LeftEdge ? PlasmaCore.Types.LeftEdge : PlasmaCore.Types.RightEdge) : plasmoid.location 160​ location: root.useListViewMode ? (plasmoid.location === PlasmaCore.Types.LeftEdge ? PlasmaCore.Types.LeftEdge : PlasmaCore.Types.RightEdge) : plasmoid.location
159 161​
160 onContainsMouseChanged: { 162​ onContainsMouseChanged: {
161 if (containsMouse && !model.blank) { 163​ if ((containsMouse || touchTap) && !model.blank) {
162 if (toolTip.active) { 164​ if (toolTip.active) {
163 toolTip.icon = model.decoration; 165​ toolTip.icon = model.decoration;
164 toolTip.mainText = model.display; 166​ toolTip.mainText = model.display;
165 167​
166 if (model.size !== undefined) { 168​ if (model.size !== undefined) {
167 toolTip.subText = model.type + "\n" + model.size; 169​ toolTip.subText = model.type + "\n" + model.size;
168 } else { 170​ } else {
169 toolTip.subText = model.type; 171​ toolTip.subText = model.type;
Show All 32 Lines203 PropertyChanges {
202 target: toolTip 204​ target: toolTip
203 x: frameLoader.x 205​ x: frameLoader.x
204 y: frameLoader.y 206​ y: frameLoader.y
205 width: frameLoader.width 207​ width: frameLoader.width
206 height: frameLoader.height 208​ height: frameLoader.height
207 } 209​ }
208 } 210​ }
209 ] 211​ ]
212​
213​ MouseArea {
martUnsubmitted
Not Done

How much of this can be done with pointer handlers?
https://doc.qt.io/qt-5/qml-qtquick-taphandler.html
quickly looking at this mousearea it seems that a taphandler coould be enough.
Would be good if somehow an extra mousearea can be avoided

mart: How much of this can be done with pointer handlers? https://doc.qt.io/qt-5/qml-qtquick…
214​ id: mousearea
215​ anchors.left: parent.left
216​ width: parent.width
217​ height: parent.height
218​ hoverEnabled: true
219​ acceptedButtons: Qt.LeftButton
220​ property int pressX: -1
221​ property int pressY: -1
222​
223​ onPositionChanged: {
224​ if (mouse.source == Qt.MouseEventSynthesizedByQt) {
225​ if (pressX != -1 && root.isDrag(pressX, pressY, mouse.x, mouse.y) && tapAndHold) {
226​console.log("FolderView MouseArea::onPositionChanged: call mouseListener.press() tapAndHold=",tapAndHold);
227​ var startpos = mapToItem (popupDialog, pressX, pressY);
228​ mouseListener.press(startpos.x, startpos.y, mouse.buttons, mouse.modifiers);
229​ tapAndHold = false;
230​ }
231​ }
232​
233​ }
234​
235​ onPressAndHold: {
236​ if (touchTap) {
237​console.log("FolderView MouseArea::onPressAndHold:");
238​ tapAndHold = true;
239​ parent.onContainsMouseChanged();
240​ }
241​ }
242​
243​ onPressed: {
244​ if (mouse.source == Qt.MouseEventSynthesizedByQt) {
245​console.log("FolderView MouseArea::onPressed:");
246​ tapAndHold = false;
247​ touchTap = true;
248​ pressX = mouse.x;
249​ pressY = mouse.y;
250​ } else {
251​ touchTap = false;
252​ }
253​ }
254​
255​ onReleased: {
256​ if (mouse.source == Qt.MouseEventSynthesizedByQt) {
257​console.log("FolderView MouseArea::onReleased: call mouseListener.press() and mouseListener.click() tapAndHold=",tapAndHold);
258​ if (tapAndHold) {
259​ var pos = mapToItem (popupDialog, mouse.x, mouse.y);
260​ mouseListener.press(pos.x, pos.y, Qt.RightButton, mouse.modifiers);
261​ tapAndHold = false;
262​ } else {
263​ parent.onContainsMouseChanged();
264​ var pos = mapToItem (popupDialog, mouse.x, mouse.y);
265​ mouseListener.press(pos.x, pos.y, mouse.buttons, mouse.modifiers);
266​ mouseListener.click(pos.x, pos.y, Qt.LeftButton);
267​ }
268​ }
269​ touchTap = false;
270​ tapAndHold = false;
271​ pressX = -1;
272​ pressY = -1;
273​ }
274​ }
210 } 275​ }
211 276​
212 Loader { 277​ Loader {
213 id: frameLoader 278​ id: frameLoader
214 279​
215 x: root.useListViewMode ? 0 : units.smallSpacing 280​ x: root.useListViewMode ? 0 : units.smallSpacing
216 y: root.useListViewMode ? 0 : units.smallSpacing 281​ y: root.useListViewMode ? 0 : units.smallSpacing
217 282​
▲ Show 20 Lines • Show All 175 Lines • ▼ Show 20 Line(s)452 PlasmaCore.FrameSvgItem {
393 opacity: Window.active ? 1 : 0.4 458​ opacity: Window.active ? 1 : 0.4
394 } 459​ }
395 } 460​ }
396 461​
397 Component { 462​ Component {
398 id: selectionButtonComponent 463​ id: selectionButtonComponent
399 464​
400 FolderItemActionButton { 465​ FolderItemActionButton {
466​ visible: !touchTap
467​
401 element: model.selected ? "remove" : "add" 468​ element: model.selected ? "remove" : "add"
402 469​
403 onClicked: dir.toggleSelected(positioner.map(index)) 470​ onClicked: dir.toggleSelected(positioner.map(index))
404 } 471​ }
405 } 472​ }
406 473​
407 Component { 474​ Component {
408 id: popupButtonComponent 475​ id: popupButtonComponent
409 476​
410 FolderItemActionButton { 477​ FolderItemActionButton {
411 visible: main.GridView.view.isRootView && (popupDialog == null) 478​ visible: main.GridView.view.isRootView && (popupDialog == null) && !touchTap
412 479​
413 element: "open" 480​ element: "open"
414 481​
415 onClicked: { 482​ onClicked: {
416 dir.setSelected(positioner.map(index)) 483​ dir.setSelected(positioner.map(index))
417 openPopup(); 484​ openPopup();
418 } 485​ }
419 } 486​ }
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines