videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

qml: fix qt6 parameters injection warning from MouseArea

This commit is contained in:
Pierre Lamot 2024-01-22 16:08:22 +01:00 committed by Steve Lhomme
parent c12cb47d0a
commit d34c08723d
15 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml
View File

@ -78,7 +78,7 @@ Control {
} }
} }
onPressed: { onPressed: (mouse) => {
const pos = mapToItem(control.contentItem.target.parent, mouseX, mouseY) const pos = mapToItem(control.contentItem.target.parent, mouseX, mouseY)
control.contentItem.target.y = pos.y + VLCStyle.dragDelta control.contentItem.target.y = pos.y + VLCStyle.dragDelta
control.contentItem.target.x = pos.x + VLCStyle.dragDelta control.contentItem.target.x = pos.x + VLCStyle.dragDelta

2
modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml
View File

@ -159,7 +159,7 @@ GridView {
} }
} }
onPressed: { onPressed: (mouse) => {
const pos = mapToItem(buttonDragItem.parent, mouseX, mouseY) const pos = mapToItem(buttonDragItem.parent, mouseX, mouseY)
buttonDragItem.y = pos.y + VLCStyle.dragDelta buttonDragItem.y = pos.y + VLCStyle.dragDelta
buttonDragItem.x = pos.x + VLCStyle.dragDelta buttonDragItem.x = pos.x + VLCStyle.dragDelta

6
modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml
View File

@ -118,19 +118,19 @@ T.ItemDelegate {
} }
} }
onClicked: function(mouse) { onClicked: (mouse) => {
if (!(root.selected && mouse.button === Qt.RightButton)) { if (!(root.selected && mouse.button === Qt.RightButton)) {
view.selectionModel.updateSelection(mouse.modifiers, view.currentIndex, index) view.selectionModel.updateSelection(mouse.modifiers, view.currentIndex, index)
view.currentIndex = index view.currentIndex = index
} }
} }
onDoubleClicked: function(mouse) { onDoubleClicked: (mouse) => {
if (mouse.button !== Qt.RightButton) if (mouse.button !== Qt.RightButton)
MediaLib.addAndPlay(model.id); MediaLib.addAndPlay(model.id);
} }
onPressed: { onPressed: (mouse) => {
root.forceActiveFocus(Qt.MouseFocusReason) root.forceActiveFocus(Qt.MouseFocusReason)
} }
} }

2
modules/gui/qt/player/qml/PlaybackSpeed.qml
View File

@ -241,7 +241,7 @@ ColumnLayout {
acceptedButtons: Qt.LeftButton acceptedButtons: Qt.LeftButton
onPressed: { onPressed: (mouse) => {
mouse.accepted = false mouse.accepted = false
root._shiftPressed = (mouse.modifiers === Qt.ShiftModifier) root._shiftPressed = (mouse.modifiers === Qt.ShiftModifier)

2
modules/gui/qt/player/qml/Player.qml
View File

@ -360,7 +360,7 @@ FocusScope {
visible: !rootPlayer.hasEmbededVideo visible: !rootPlayer.hasEmbededVideo
onWheel: { onWheel: (wheel) => {
if (rootPlayer.hasEmbededVideo) { if (rootPlayer.hasEmbededVideo) {
wheel.accepted = false wheel.accepted = false

6
modules/gui/qt/player/qml/SliderBar.qml
View File

@ -229,11 +229,11 @@ Slider {
preventStealing: true preventStealing: true
onPressed: fsm.pressControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) onPressed: (mouse) => { fsm.pressControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) }
onReleased: fsm.releaseControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) onReleased: (mouse) => { fsm.releaseControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) }
onPositionChanged: fsm.moveControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) onPositionChanged: (mouse) => { fsm.moveControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) }
onEntered: { onEntered: {
if(Player.hasChapters) if(Player.hasChapters)

6
modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml
View File

@ -173,7 +173,7 @@ T.Control {
} }
} }
onPressed: { onPressed: (mouse) => {
if (!cursorInside) { if (!cursorInside) {
mouse.accepted = false mouse.accepted = false
return return
@ -182,12 +182,12 @@ T.Control {
root.forceActiveFocus(Qt.MouseFocusReason) root.forceActiveFocus(Qt.MouseFocusReason)
} }
onClicked: { onClicked: (mouse) => {
MainPlaylistController.togglePlayPause() MainPlaylistController.togglePlayPause()
mouse.accepted = true mouse.accepted = true
} }
onPressAndHold: { onPressAndHold: (mouse) => {
_pressAndHoldAction() _pressAndHoldAction()
mouse.accepted = true mouse.accepted = true
} }

11
modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml
View File

@ -238,7 +238,7 @@ T.Pane {
anchors.margins: -(VLCStyle.dp(4, VLCStyle.scale)) anchors.margins: -(VLCStyle.dp(4, VLCStyle.scale))
onPressed: { onPressed: (mouse) => {
mouse.accepted = false mouse.accepted = false
if (mouse.modifiers === Qt.ShiftModifier) if (mouse.modifiers === Qt.ShiftModifier)
@ -256,7 +256,7 @@ T.Pane {
acceptedButtons: (Qt.LeftButton | Qt.RightButton) acceptedButtons: (Qt.LeftButton | Qt.RightButton)
onPressed: { onPressed: (mouse) => {
if (root.paintOnly) { if (root.paintOnly) {
mouse.accepted = true mouse.accepted = true
return return
@ -273,9 +273,12 @@ T.Pane {
adjustVolume(mouse) adjustVolume(mouse)
} }
onPositionChanged: if (mouse.buttons & Qt.RightButton) adjustVolume(mouse) onPositionChanged: (mouse) => {
if (mouse.buttons & Qt.RightButton)
adjustVolume(mouse)
}
onWheel: { onWheel: (wheel) => {
let delta = 0, fineControl = false let delta = 0, fineControl = false
if ((Math.abs(wheel.pixelDelta.x) % 120 > 0) || (Math.abs(wheel.pixelDelta.y) % 120 > 0)) { if ((Math.abs(wheel.pixelDelta.x) % 120 > 0) || (Math.abs(wheel.pixelDelta.y) % 120 > 0)) {

6
modules/gui/qt/playlist/qml/PlaylistDelegate.qml
View File

@ -245,7 +245,7 @@ T.ItemDelegate {
acceptedButtons: Qt.LeftButton | Qt.RightButton acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: { onClicked: (mouse) => {
/* to receive keys events */ /* to receive keys events */
if (!(delegate.selected && mouse.button === Qt.RightButton)) { if (!(delegate.selected && mouse.button === Qt.RightButton)) {
view.selectionModel.updateSelection(mouse.modifiers, view.currentIndex, index) view.selectionModel.updateSelection(mouse.modifiers, view.currentIndex, index)
@ -256,12 +256,12 @@ T.ItemDelegate {
contextMenu.popup(index, this.mapToGlobal(mouse.x, mouse.y)) contextMenu.popup(index, this.mapToGlobal(mouse.x, mouse.y))
} }
onDoubleClicked: { onDoubleClicked: (mouse) => {
if (mouse.button !== Qt.RightButton) if (mouse.button !== Qt.RightButton)
MainPlaylistController.goTo(index, true) MainPlaylistController.goTo(index, true)
} }
onPressed: { onPressed: (mouse) => {
delegate.forceActiveFocus(Qt.MouseFocusReason) delegate.forceActiveFocus(Qt.MouseFocusReason)
} }

4
modules/gui/qt/widgets/qml/ExpandGridView.qml
View File

@ -634,7 +634,7 @@ FocusScope {
preventStealing: true preventStealing: true
acceptedButtons: Qt.LeftButton | Qt.RightButton acceptedButtons: Qt.LeftButton | Qt.RightButton
onPressed: { onPressed: (mouse) => {
Helpers.enforceFocus(flickable, Qt.MouseFocusReason) Helpers.enforceFocus(flickable, Qt.MouseFocusReason)
if (!(mouse.modifiers & (Qt.ShiftModifier | Qt.ControlModifier))) { if (!(mouse.modifiers & (Qt.ShiftModifier | Qt.ControlModifier))) {
@ -643,7 +643,7 @@ FocusScope {
} }
} }
onReleased: { onReleased: (mouse) => {
if (mouse.button & Qt.RightButton) { if (mouse.button & Qt.RightButton) {
root.showContextMenu(mapToGlobal(mouse.x, mouse.y)) root.showContextMenu(mapToGlobal(mouse.x, mouse.y))
} }

8
modules/gui/qt/widgets/qml/GridItem.qml
View File

@ -188,7 +188,7 @@ T.ItemDelegate {
drag.smoothed: false drag.smoothed: false
onClicked: { onClicked: (mouse) => {
if (mouse.button === Qt.RightButton) if (mouse.button === Qt.RightButton)
contextMenuButtonClicked(picture, root.mapToGlobal(mouse.x,mouse.y)); contextMenuButtonClicked(picture, root.mapToGlobal(mouse.x,mouse.y));
else { else {
@ -196,12 +196,12 @@ T.ItemDelegate {
} }
} }
onDoubleClicked: { onDoubleClicked: (mouse) => {
if (mouse.button === Qt.LeftButton) if (mouse.button === Qt.LeftButton)
root.itemDoubleClicked(picture,mouse.buttons, mouse.modifiers) root.itemDoubleClicked(picture,mouse.buttons, mouse.modifiers)
} }
onPressed: { onPressed: (mouse) => {
_modifiersOnLastPress = mouse.modifiers _modifiersOnLastPress = mouse.modifiers
} }
@ -252,7 +252,7 @@ T.ItemDelegate {
Layout.preferredWidth: pictureWidth Layout.preferredWidth: pictureWidth
Layout.preferredHeight: pictureHeight Layout.preferredHeight: pictureHeight
onPlayIconClicked: { onPlayIconClicked: (mouse) => {
// emulate a mouse click before delivering the play signal as to select the item // emulate a mouse click before delivering the play signal as to select the item
// this helps in updating the selection and restore of initial index in the parent views // this helps in updating the selection and restore of initial index in the parent views
root.itemClicked(picture, mouse.button, mouse.modifiers) root.itemClicked(picture, mouse.button, mouse.modifiers)

4
modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml
View File

@ -42,12 +42,12 @@ MouseArea {
width: VLCStyle.dp(8, VLCStyle.scale) width: VLCStyle.dp(8, VLCStyle.scale)
acceptedButtons: Qt.LeftButton acceptedButtons: Qt.LeftButton
onPressed: { onPressed: (mouse) => {
MainCtx.setCursor(cursorShape) MainCtx.setCursor(cursorShape)
_previousX = mouseX _previousX = mouseX
} }
onReleased: { onReleased:(mouse) => {
MainCtx.restoreCursor() MainCtx.restoreCursor()
} }

4
modules/gui/qt/widgets/qml/KeyNavigableListView.qml
View File

@ -314,7 +314,7 @@ ListView {
acceptedButtons: Qt.LeftButton | Qt.RightButton acceptedButtons: Qt.LeftButton | Qt.RightButton
onPressed: { onPressed: (mouse) => {
focus = true // Grab the focus from delegate focus = true // Grab the focus from delegate
root.forceActiveFocus(Qt.MouseFocusReason) // Re-focus the list root.forceActiveFocus(Qt.MouseFocusReason) // Re-focus the list
@ -326,7 +326,7 @@ ListView {
mouse.accepted = true mouse.accepted = true
} }
onReleased: { onReleased: (mouse) => {
if (mouse.button & Qt.RightButton) { if (mouse.button & Qt.RightButton) {
root.showContextMenu(mapToGlobal(mouse.x, mouse.y)) root.showContextMenu(mapToGlobal(mouse.x, mouse.y))
} }

2
modules/gui/qt/widgets/qml/MediaCover.qml
View File

@ -105,7 +105,7 @@ Rectangle {
sourceComponent: Widgets.PlayCover { sourceComponent: Widgets.PlayCover {
width: playIconSize width: playIconSize
onClicked: playIconClicked(mouse) onClicked: (mouse) => playIconClicked(mouse)
} }
asynchronous: true asynchronous: true

6
modules/gui/qt/widgets/qml/TableViewDelegate.qml
View File

@ -127,11 +127,11 @@ T.Control {
// Events // Events
onPressed: { onPressed: (mouse) => {
_modifiersOnLastPress = mouse.modifiers _modifiersOnLastPress = mouse.modifiers
} }
onClicked: { onClicked: (mouse) => {
if ((mouse.button === Qt.LeftButton) || !delegate.selected) { if ((mouse.button === Qt.LeftButton) || !delegate.selected) {
delegate.selectAndFocus(mouse.modifiers, Qt.MouseFocusReason) delegate.selectAndFocus(mouse.modifiers, Qt.MouseFocusReason)
} }
@ -140,7 +140,7 @@ T.Control {
delegate.rightClick(delegate, delegate.rowModel, hoverArea.mapToGlobal(mouse.x, mouse.y)) delegate.rightClick(delegate, delegate.rowModel, hoverArea.mapToGlobal(mouse.x, mouse.y))
} }
onDoubleClicked: { onDoubleClicked: (mouse) => {
if (mouse.button === Qt.LeftButton) if (mouse.button === Qt.LeftButton)
delegate.itemDoubleClicked(delegate._index, delegate.rowModel) delegate.itemDoubleClicked(delegate._index, delegate.rowModel)
} }