[vlc-commits] [Git][videolan/vlc][master] 4 commits: qml: do not override application cursor in DragItem
Felix Paul Kühne (@fkuehne)
gitlab at videolan.org
Sat Sep 14 09:54:31 UTC 2024
Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
fc618f3f by Fatih Uzunoglu at 2024-09-14T09:34:06+00:00
qml: do not override application cursor in DragItem
Since drag is a native drag, cursor change is not
no longer application's responsibility.
- - - - -
62a5a530 by Fatih Uzunoglu at 2024-09-14T09:34:06+00:00
qml: use busy cursor as soon as applicable in PlaylistMediaList
Although progress indicator is shown with a delay, the cursor
should be rather changed to busy cursor as soon as possible.
It is not really conventional to wait setting busy cursor
when the view is already busy.
- - - - -
6a473778 by Fatih Uzunoglu at 2024-09-14T09:34:06+00:00
qml: use busy cursor as soon as applicable in PlaylistMediaDisplay
Although progress indicator is shown with a delay, the cursor
should be rather changed to busy cursor as soon as possible.
It is not really conventional to wait setting busy cursor
when the view is already busy.
- - - - -
c19d9d69 by Fatih Uzunoglu at 2024-09-14T09:34:06+00:00
qml: do not override application cursor in playqueue button drop area
- - - - -
4 changed files:
- modules/gui/qt/maininterface/qml/BannerSources.qml
- modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml
- modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml
- modules/gui/qt/widgets/qml/DragItem.qml
Changes:
=====================================
modules/gui/qt/maininterface/qml/BannerSources.qml
=====================================
@@ -422,17 +422,10 @@ T.ToolBar {
anchors.fill: parent
onContainsDragChanged: {
- if (containsDrag) {
+ if (containsDrag)
_timer.restart()
-
- if (plListView)
- MainCtx.setCursor(Qt.DragCopyCursor)
- } else {
+ else
_timer.stop()
-
- if (plListView)
- MainCtx.restoreCursor()
- }
}
onEntered: (drag) => {
=====================================
modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml
=====================================
@@ -130,11 +130,13 @@ FocusScope {
}
onTransactionPendingChanged: {
- if (transactionPending)
+ if (transactionPending) {
+ MainCtx.setCursor(root, Qt.BusyCursor)
visibilityTimer.start()
- else {
+ } else {
visibilityTimer.stop()
progressIndicator.visible = false
+ MainCtx.unsetCursor(root)
}
}
}
@@ -151,13 +153,6 @@ FocusScope {
text: qsTr("Processing...")
- onVisibleChanged: {
- if (visible)
- MainCtx.setCursor(root, Qt.BusyCursor)
- else
- MainCtx.unsetCursor(root)
- }
-
Timer {
id: visibilityTimer
=====================================
modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml
=====================================
@@ -107,11 +107,13 @@ MainViewLoader {
coverPrefix: (isMusic) ? "playlist-music" : "playlist-video"
onTransactionPendingChanged: {
- if (transactionPending)
+ if (transactionPending) {
+ MainCtx.setCursor(root, Qt.BusyCursor)
visibilityTimer.start()
- else {
+ } else {
visibilityTimer.stop()
progressIndicator.visible = false
+ MainCtx.unsetCursor(root)
}
}
}
@@ -202,13 +204,6 @@ MainViewLoader {
text: qsTr("Processing...")
- onVisibleChanged: {
- if (visible)
- MainCtx.setCursor(root, Qt.BusyCursor)
- else
- MainCtx.unsetCursor(root)
- }
-
Timer {
id: visibilityTimer
=====================================
modules/gui/qt/widgets/qml/DragItem.qml
=====================================
@@ -293,13 +293,9 @@ Item {
dragItem._dropFailedCallback = null
dragItem._dropCallback = null
dragItem._inputItems = undefined
-
- MainCtx.setCursor(Qt.DragMoveCursor)
}
function exit() {
- MainCtx.restoreCursor()
-
_pendingNativeDragStart = false
}
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b95e5673f4dd92fddb260dbe8f111eda7910214c...c19d9d6940261170734b80df06a92881815c899c
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b95e5673f4dd92fddb260dbe8f111eda7910214c...c19d9d6940261170734b80df06a92881815c899c
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list