From a6326c3dec8033fb421cd73aaaa7f739ee91f377 Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Tue, 10 Feb 2026 17:49:18 +0800 Subject: [PATCH] feat(ui): update button appearance by setting ColorSelector inactive state Set D.ColorSelector.inactived: false on buttons and input fields across update module QML files to ensure consistent visual appearance and prevent unintended inactive styling. log: button appearance by setting ColorSelector inactive state bug: PMS-298841 --- src/dcc-update-plugin/qml/CheckUpdate.qml | 1 + src/dcc-update-plugin/qml/QuitTestingChannelDialog.qml | 2 ++ src/dcc-update-plugin/qml/UpdateControl.qml | 4 ++++ src/dcc-update-plugin/qml/UpdateLogDialog.qml | 2 ++ src/dcc-update-plugin/qml/UpdateSelectDialog.qml | 2 +- src/dcc-update-plugin/qml/UpdateSetting.qml | 4 ++++ 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/dcc-update-plugin/qml/CheckUpdate.qml b/src/dcc-update-plugin/qml/CheckUpdate.qml index 35ed9c0e8..4e7f1cae1 100644 --- a/src/dcc-update-plugin/qml/CheckUpdate.qml +++ b/src/dcc-update-plugin/qml/CheckUpdate.qml @@ -53,6 +53,7 @@ ColumnLayout { } D.Button { + D.ColorSelector.inactived: false Layout.alignment: Qt.AlignHCenter implicitWidth: 200 visible: text.length !== 0 diff --git a/src/dcc-update-plugin/qml/QuitTestingChannelDialog.qml b/src/dcc-update-plugin/qml/QuitTestingChannelDialog.qml index 7f4ec3186..f71e8281c 100644 --- a/src/dcc-update-plugin/qml/QuitTestingChannelDialog.qml +++ b/src/dcc-update-plugin/qml/QuitTestingChannelDialog.qml @@ -35,6 +35,7 @@ D.DialogWindow { Layout.bottomMargin: 10 spacing: 10 D.Button { + D.ColorSelector.inactived: false Layout.fillWidth: true text: qsTr("Cancel") onClicked: { @@ -42,6 +43,7 @@ D.DialogWindow { } } D.RecommandButton { + D.ColorSelector.inactived: false Layout.fillWidth: true text: qsTr("Exit") onClicked: { diff --git a/src/dcc-update-plugin/qml/UpdateControl.qml b/src/dcc-update-plugin/qml/UpdateControl.qml index da873075c..26536731b 100644 --- a/src/dcc-update-plugin/qml/UpdateControl.qml +++ b/src/dcc-update-plugin/qml/UpdateControl.qml @@ -90,6 +90,7 @@ ColumnLayout { } D.Button { + D.ColorSelector.inactived: false Layout.alignment: Qt.AlignLeft | Qt.AlignTop visible: showLogButton text: qsTr("View Update Log") @@ -119,6 +120,7 @@ ColumnLayout { Repeater { model: btnActions delegate: D.Button { + D.ColorSelector.inactived: false Layout.alignment: Qt.AlignRight | Qt.AlignVCenter text: modelData font: D.DTK.fontManager.t6 @@ -157,6 +159,7 @@ ColumnLayout { D.ToolButton { id: pauseIcon + D.ColorSelector.inactived: false icon.name: isPauseOrNot ? "update_start" : "update_pause" icon.width: 24 icon.height: 24 @@ -175,6 +178,7 @@ ColumnLayout { D.ToolButton { id: stopIcon + D.ColorSelector.inactived: false icon.name: "update_stop" icon.width: 24 icon.height: 24 diff --git a/src/dcc-update-plugin/qml/UpdateLogDialog.qml b/src/dcc-update-plugin/qml/UpdateLogDialog.qml index 85265cb58..8315cafd4 100644 --- a/src/dcc-update-plugin/qml/UpdateLogDialog.qml +++ b/src/dcc-update-plugin/qml/UpdateLogDialog.qml @@ -61,6 +61,7 @@ D.DialogWindow { spacing: 10 Button { + D.ColorSelector.inactived: false Layout.fillWidth: true text: qsTr("Close") onClicked: { @@ -69,6 +70,7 @@ D.DialogWindow { } D.RecommandButton { + D.ColorSelector.inactived: false Layout.fillWidth: true text: qsTr("Export to desktop") onClicked: { diff --git a/src/dcc-update-plugin/qml/UpdateSelectDialog.qml b/src/dcc-update-plugin/qml/UpdateSelectDialog.qml index 32f715cae..4d835242f 100644 --- a/src/dcc-update-plugin/qml/UpdateSelectDialog.qml +++ b/src/dcc-update-plugin/qml/UpdateSelectDialog.qml @@ -71,7 +71,7 @@ D.DialogWindow { component ButtonWithToolTip: D.Button { id: customButton - + D.ColorSelector.inactived: false contentItem: Text { id: buttonText text: customButton.text diff --git a/src/dcc-update-plugin/qml/UpdateSetting.qml b/src/dcc-update-plugin/qml/UpdateSetting.qml index 2f6ac9768..f835bc7df 100644 --- a/src/dcc-update-plugin/qml/UpdateSetting.qml +++ b/src/dcc-update-plugin/qml/UpdateSetting.qml @@ -118,6 +118,7 @@ DccObject { Layout.fillWidth: true } D.ToolButton { + D.ColorSelector.inactived: false textColor: D.Palette { normal { common: D.DTK.makeColor(D.Color.Highlight) @@ -197,6 +198,7 @@ DccObject { page: RowLayout { D.LineEdit { id: lineEdit + D.ColorSelector.inactived: false maximumLength: 5 validator: RegularExpressionValidator { regularExpression: /^\d*$/ } alertText: qsTr("Only numbers between 1-99999 are allowed") @@ -378,6 +380,7 @@ DccObject { pageType: DccObject.Editor page: D.Button { implicitWidth: fm.advanceWidth(text) + fm.averageCharacterWidth * 2 + D.ColorSelector.inactived: false text: qsTr("View") onClicked: { dccData.model().historyModel.refreshHistory() @@ -503,6 +506,7 @@ DccObject { visible: dccData.model().testingChannelStatus === Common.WaitJoined pageType: DccObject.Editor page: D.ToolButton { + D.ColorSelector.inactived: false text: qsTr("Click here to complete the application") textColor: D.Palette { normal {