fix: disabled lable and combobox opacity not changed

set opacity of disabled item icon
linuxdeepin · Dec 17, 2024 · 194a1da · 194a1da
1 parent 1f22466
commit 194a1da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/dde-control-center/frame/plugin/DccLabel.qml b/src/dde-control-center/frame/plugin/DccLabel.qml
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 import QtQuick 2.15
 import QtQuick.Controls 2.15
+import org.deepin.dtk 1.0
 
 Label {
     id: root

diff --git a/src/plugin-accounts/qml/AccountSettings.qml b/src/plugin-accounts/qml/AccountSettings.qml
@@ -298,11 +298,11 @@ DccObject {
             displayName: qsTr("Acount type")
             weight: 30
             pageType: DccObject.Editor
+            enabled: dccData.isDeleteAble(settings.userId)
             page: ComboBox {
                 flat: true
                 model: dccData.userTypes()
                 currentIndex: dccData.userType(settings.userId)
-                enabled: dccData.isDeleteAble(settings.userId)
                 onActivated: function (index) {
                     dccData.setUserType(settings.userId, index)
                 }

diff --git a/src/plugin-accounts/qml/LoginMethod.qml b/src/plugin-accounts/qml/LoginMethod.qml
@@ -5,7 +5,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import org.deepin.dcc 1.0
-import org.deepin.dtk 1.0 as D
+import org.deepin.dtk 1.0
 
 DccObject {
     id: loginMethodTitle
@@ -100,8 +100,9 @@ DccObject {
                         Control {
                             Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
                             Layout.rightMargin: 10
-                            contentItem: D.IconLabel {
+                            contentItem: IconLabel {
                                 icon.name: "arrow_ordinary_right"
+                                opacity: enabled ? 1 : 0.4
                             }
                         }
                     }