fix: PageIndicator style issue

1. 小启动器应用组指示器改为5x5 间距5，大启动器的主页和应用组改为10x10间距10 2. 颜色统一 Issue: linuxdeepin/developer-center#8688
linuxdeepin · May 28, 2024 · 09539b2 · 09539b2
1 parent 6c7f0ce
commit 09539b2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/qml/FolderGridViewPopup.qml b/qml/FolderGridViewPopup.qml
@@ -267,6 +267,22 @@ Popup {
                     count: folderPagesView.count
                     currentIndex: folderPagesView.currentIndex
                     interactive: true
+                    spacing: isWindowedMode ? 5 : 10
+
+                    delegate: Rectangle {
+                        implicitWidth: isWindowedMode ? 5 : 10
+                        implicitHeight: isWindowedMode ? 5 : 10
+
+                        radius: width / 2
+                        color: Qt.rgba(255, 255, 255, index === folderPageIndicator.currentIndex ? 0.9 : pressed ? 0.5 : 0.2)
+                        Behavior on opacity { OpacityAnimator { duration: 100 } }
+                        OutsideBoxBorder {
+                            anchors.fill: parent
+                            radius: parent.radius
+                            width: 1
+                            color: Qt.rgba(0, 0, 0, 0.1)
+                        }
+                    }
                 }
             }
         }

diff --git a/qml/FullscreenFrame.qml b/qml/FullscreenFrame.qml
@@ -178,19 +178,18 @@ Control {
                     count: searchResultGridViewContainer.visible ? 1 : pages.count
                     currentIndex: searchResultGridViewContainer.visible ? 1 : pages.currentIndex
                     interactive: true
+                    spacing: 10
                     delegate: Rectangle {
-                        width: DS.Style.pageIndicator.width
-                        height: width
+                        width: 10
+                        height: 10
 
                         radius: width / 2
-                        color: indicator.enabled ? "white" : "gray"
-
-                        opacity: index === indicator.currentIndex ? 1 : pressed ? 0.7 : 0.40
-
+                        color: Qt.rgba(255, 255, 255, index === indicator.currentIndex ? 0.9 : pressed ? 0.5 : 0.2)
                         OutsideBoxBorder {
                             anchors.fill: parent
                             radius: parent.radius
-                            color: Qt.rgba(0, 0, 0, 0.2)
+                            width: 1
+                            color: Qt.rgba(0, 0, 0, 0.1)
                         }
                     }
                 }