diff --git a/qml/FolderGridViewPopup.qml b/qml/FolderGridViewPopup.qml index 6d5381dc..86b2031a 100644 --- a/qml/FolderGridViewPopup.qml +++ b/qml/FolderGridViewPopup.qml @@ -174,6 +174,7 @@ Popup { padding: 10 interactive: false focus: true + gridViewClip: false // TODO it maybe a bug for dtk, https://github.com/linuxdeepin/developer-center/issues/8468 activeGridViewFocusOnTab: folderGridViewLoader.SwipeView.isCurrentItem itemMove: Transition { NumberAnimation { properties: "x,y"; duration: 250 } } delegate: DelegateDropArea { @@ -196,6 +197,7 @@ Popup { paddingColumns: 2 interactive: false focus: true + gridViewClip: false activeGridViewFocusOnTab: folderGridViewLoader.SwipeView.isCurrentItem delegate: DelegateDropArea { width: folderGridViewContainer.cellWidth diff --git a/qml/GridViewContainer.qml b/qml/GridViewContainer.qml index c5f83448..4c999ac5 100644 --- a/qml/GridViewContainer.qml +++ b/qml/GridViewContainer.qml @@ -21,6 +21,7 @@ FocusScope { property alias interactive: gridView.interactive property alias padding: item.anchors.margins property alias gridViewFocus: gridView.focus + property alias gridViewClip: gridView.clip property ScrollBar vScrollBar property bool activeGridViewFocusOnTab: false property Transition itemMove @@ -80,7 +81,7 @@ FocusScope { ScrollBar.vertical: root.vScrollBar anchors.fill: parent - clip: false // TODO it maybe a bug for dtk, https://github.com/linuxdeepin/developer-center/issues/8468 + clip: true highlightFollowsCurrentItem: true keyNavigationEnabled: true highlightMoveDuration: 150 diff --git a/qml/windowed/GridViewContainer.qml b/qml/windowed/GridViewContainer.qml index ccf27b41..1c7410f2 100644 --- a/qml/windowed/GridViewContainer.qml +++ b/qml/windowed/GridViewContainer.qml @@ -22,6 +22,7 @@ FocusScope { property alias delegate: gridView.delegate property alias interactive: gridView.interactive property alias gridViewFocus: gridView.focus + property alias gridViewClip: gridView.clip property bool activeGridViewFocusOnTab: false property int columns: 4 property int rows: Math.min(Math.ceil(count * 1.0 / columns), Helper.windowed.maxViewRows)