Skip to content

Commit 7806e5d

Browse files
committed
fix: [review] When the sidebar content is fully displayed, only the vertical scroll wheel is used
1.When the sidebar content is fully displayed, only the vertical scroll wheel is used; 2.Adjust Image show style. Log: When the sidebar content is fully displayed, only the vertical scroll wheel is used
1 parent 4289a5a commit 7806e5d

File tree

3 files changed

+16
-19
lines changed

3 files changed

+16
-19
lines changed

src/qml/Control/ListView/ThumbnailListDelegate.qml

+14-17
Original file line numberDiff line numberDiff line change
@@ -104,30 +104,27 @@ Item {
104104
visible: false
105105
}
106106

107-
OpacityMask{
108-
id: opacityMask
109-
anchors.fill: maskRec
110-
source: image
111-
maskSource: mask
112-
}
107+
DropShadow {
108+
anchors.fill: opacityMask
109+
110+
horizontalOffset: -0.5
111+
verticalOffset: 1.3
112+
113+
radius: 1.0
114+
samples: radius * 2 + 1
115+
spread: 0.01
116+
117+
smooth: true
118+
opacity: 0.1
113119

114-
FastBlur {
115-
anchors.top: opacityMask.top; anchors.topMargin: 6
116-
anchors.left: opacityMask.left; anchors.leftMargin: 1
117-
width: opacityMask.width - 2; height: opacityMask.height - 6
118120
source: opacityMask
119-
radius: 10
120-
transparentBorder: true
121121
}
122122

123-
//遮罩执行
124-
OpacityMask {
125-
id: mask
123+
OpacityMask{
124+
id: opacityMask
126125
anchors.fill: maskRec
127126
source: image
128127
maskSource: maskRec
129-
antialiasing: true
130-
smooth: true
131128
}
132129

133130
//border and shadow

src/qml/SideBar/Sidebar.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import "../"
1616
ScrollView {
1717
id: sidebarScrollView
1818
clip: true
19-
wheelEnabled: false
19+
wheelEnabled: column.height > sidebarScrollView.height
2020
signal sideBarListChanged(string type, string displayName)
2121
property int currentImportCustomIndex: 0 //自动导入相册当前索引值
2222
property int currentCustomIndex: 0 //自定义相册当前索引值

src/qml/ThumbnailImageView/HaveImportedView/HaveImportedView.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ BaseView {
4747

4848
// 筛选类型改变处理事件
4949
onFilterTypeChanged: {
50-
if (visible)
50+
if (visible && !GStatus.loading)
5151
flushHaveImportedView()
5252
}
5353

0 commit comments

Comments
 (0)