[vlc-commits] [Git][videolan/vlc][master] 3 commits: qml: fix vertical anchor loop in EditorDNDView
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon May 6 10:09:43 UTC 2024
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
7d71e47c by Fatih Uzunoglu at 2024-05-06T07:36:48+00:00
qml: fix vertical anchor loop in EditorDNDView
- - - - -
11d21c7e by Fatih Uzunoglu at 2024-05-06T07:36:48+00:00
qml: limit footer drop area's height in EditorDNDView
- - - - -
07085e4f by Fatih Uzunoglu at 2024-05-06T07:36:48+00:00
qml: use template control in EditorDNDDelegate
Default Control may cause alignment and size
issues here. This is observed with KDE's
theme.
- - - - -
2 changed files:
- modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml
- modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml
Changes:
=====================================
modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml
=====================================
@@ -17,7 +17,7 @@
*****************************************************************************/
import QtQuick
-import QtQuick.Controls
+import QtQuick.Templates as T
import QtQuick.Layouts
import QtQml.Models
@@ -27,11 +27,16 @@ import "qrc:///player/"
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
-Control {
+T.Control {
id: control
padding: background.border.width
+ implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+ implicitContentWidth + leftPadding + rightPadding)
+ implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+ implicitContentHeight + topPadding + bottomPadding)
+
readonly property int controlId: model.id
property ListView dndView: null
=====================================
modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml
=====================================
@@ -113,9 +113,7 @@ ListView {
}
footer: Item {
- anchors.verticalCenter: parent.verticalCenter
-
- implicitHeight: VLCStyle.icon_medium
+ implicitHeight: playerBtnDND.height
Binding on implicitWidth {
delayed: true
@@ -125,13 +123,14 @@ ListView {
property alias dropVisible: footerDropArea.containsDrag
Rectangle {
+ id: footerDropIndicator
+ anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
- anchors.top: parent.top
- anchors.bottom: parent.bottom
z: 2
implicitWidth: VLCStyle.dp(2, VLCStyle.scale)
+ implicitHeight: VLCStyle.icon_medium
visible: dropVisible
color: theme.accent
@@ -140,7 +139,12 @@ ListView {
DropArea {
id: footerDropArea
- anchors.fill: parent
+ anchors {
+ left: parent.left
+ right: parent.right
+ top: footerDropIndicator.top
+ bottom: footerDropIndicator.bottom
+ }
onEntered: (drag) => {
if (drag.source.dndView === playerBtnDND &&
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/43f8925a604d7a90731f864cf52fc1a3d45dbdb2...07085e4ffb55338722da6c819bfc023e27c33a40
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/43f8925a604d7a90731f864cf52fc1a3d45dbdb2...07085e4ffb55338722da6c819bfc023e27c33a40
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