Adjust some details

src/qml/StandardButton.qml

@@ -25,12 +25,10 @@ Button {
     id: control
 
     property color backgroundColor: FishUI.Theme.darkMode ? "#363636" : "#FFFFFF"
-    property color hoveredColor: Qt.tint(FishUI.Theme.textColor, Qt.rgba(backgroundColor.r,
-                                                                         backgroundColor.g,
-                                                                         backgroundColor.b, 0.9))
-    property color pressedColor: Qt.tint(FishUI.Theme.textColor, Qt.rgba(backgroundColor.r,
-                                                                         backgroundColor.g,
-                                                                         backgroundColor.b, 0.8))
+    property color hoveredColor: FishUI.Theme.darkMode ? Qt.lighter(backgroundColor, 1.3)
+                                                       : Qt.darker(backgroundColor, 1.1)
+    property color pressedColor: FishUI.Theme.darkMode ? Qt.lighter(backgroundColor, 1.1)
+                                                       : Qt.darker(backgroundColor, 1.2)
 
     background: Rectangle {
         radius: FishUI.Theme.mediumRadius

src/qml/User/UserDelegateItem.qml

@@ -63,7 +63,7 @@ RoundedItem {
                 id: _topItem
 
                 Layout.fillWidth: true
-                height: _topLayout.implicitHeight
+                height: _topLayout.implicitHeight + FishUI.Units.largeSpacing
 
                 MouseArea {
                     anchors.fill: parent
@@ -73,6 +73,8 @@ RoundedItem {
                 RowLayout {
                     id: _topLayout
                     anchors.fill: parent
+                    anchors.topMargin: FishUI.Units.smallSpacing
+                    anchors.bottomMargin: FishUI.Units.smallSpacing
 
                     Image {
                         id: _userImage
@@ -181,12 +183,7 @@ RoundedItem {
                 }
             }
 
-            Button {
-                text:"修改密码"
-                Layout.fillWidth: true
-            }
-
-            Button {
+            StandardButton {
                 text: qsTr("Delete this user")
                 enabled: model.userId !== loggedUser.userId
                 onClicked: accountsManager.deleteUser(userId, true)

src/qml/Wallpaper/Main.qml

@@ -40,7 +40,6 @@ ItemPage {
         ColumnLayout {
             id: layout
             anchors.fill: parent
-            anchors.topMargin: FishUI.Units.smallSpacing
             spacing: FishUI.Units.largeSpacing
 
             RoundedItem {
@@ -55,11 +54,6 @@ ItemPage {
                     TabBar {
                         Layout.fillWidth: true
 
-                        background: Rectangle {
-                            color: FishUI.Theme.darkMode ? "#4A4A4D" : "#E5E5EB"
-                            radius: FishUI.Theme.mediumRadius
-                        }
-
                         onCurrentIndexChanged: {
                             background.backgroundType = currentIndex
                         }
@@ -77,13 +71,6 @@ ItemPage {
                         }
                     }
                 }
-            }
-
-//            DesktopPreview {
-//                Layout.alignment: Qt.AlignHCenter
-//                width: 500
-//                height: 300
-//            }
 
                 GridView {
                     id: _view
@@ -217,6 +204,11 @@ ItemPage {
                     }
                 }
 
+                Item {
+                    visible: background.backgroundType === 1
+                    height: FishUI.Units.smallSpacing
+                }
+
                 Loader {
                     Layout.fillWidth: true
                     height: item.height
@@ -224,6 +216,17 @@ ItemPage {
                     sourceComponent: colorView
                 }
             }
+
+//            DesktopPreview {
+//                Layout.alignment: Qt.AlignHCenter
+//                width: 500
+//                height: 300
+//            }
+
+            Item {
+                height: FishUI.Units.largeSpacing
+            }
+        }
     }
 
     Component {
@@ -232,7 +235,10 @@ ItemPage {
         GridView {
             id: _colorView
             Layout.fillWidth: true
-            height: _colorView.count * cellHeight
+
+            property int rowCount: _colorView.width / cellWidth
+
+            implicitHeight: Math.ceil(_colorView.count / _colorView.rowCount) * cellHeight + FishUI.Units.largeSpacing
 
             cellWidth: 50
             cellHeight: 50