Skip to content

Commit 6bf5691

Browse files
committed
feat: 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
1 parent 60bbfdd commit 6bf5691

6 files changed

Lines changed: 14 additions & 1 deletion

File tree

src/dcc-update-plugin/qml/CheckUpdate.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ ColumnLayout {
5353
}
5454

5555
D.Button {
56+
D.ColorSelector.inactived: false
5657
Layout.alignment: Qt.AlignHCenter
5758
implicitWidth: 200
5859
visible: text.length !== 0

src/dcc-update-plugin/qml/QuitTestingChannelDialog.qml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,15 @@ D.DialogWindow {
3535
Layout.bottomMargin: 10
3636
spacing: 10
3737
D.Button {
38+
D.ColorSelector.inactived: false
3839
Layout.fillWidth: true
3940
text: qsTr("Cancel")
4041
onClicked: {
4142
close()
4243
}
4344
}
4445
D.RecommandButton {
46+
D.ColorSelector.inactived: false
4547
Layout.fillWidth: true
4648
text: qsTr("Exit")
4749
onClicked: {

src/dcc-update-plugin/qml/UpdateControl.qml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ ColumnLayout {
9090
}
9191

9292
D.Button {
93+
D.ColorSelector.inactived: false
9394
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
9495
visible: showLogButton
9596
text: qsTr("View Update Log")
@@ -119,6 +120,7 @@ ColumnLayout {
119120
Repeater {
120121
model: btnActions
121122
delegate: D.Button {
123+
D.ColorSelector.inactived: false
122124
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
123125
text: modelData
124126
font: D.DTK.fontManager.t6
@@ -157,6 +159,7 @@ ColumnLayout {
157159

158160
D.ToolButton {
159161
id: pauseIcon
162+
D.ColorSelector.inactived: false
160163
icon.name: isPauseOrNot ? "update_start" : "update_pause"
161164
icon.width: 24
162165
icon.height: 24
@@ -175,6 +178,7 @@ ColumnLayout {
175178

176179
D.ToolButton {
177180
id: stopIcon
181+
D.ColorSelector.inactived: false
178182
icon.name: "update_stop"
179183
icon.width: 24
180184
icon.height: 24

src/dcc-update-plugin/qml/UpdateLogDialog.qml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ D.DialogWindow {
6161
spacing: 10
6262

6363
Button {
64+
D.ColorSelector.inactived: false
6465
Layout.fillWidth: true
6566
text: qsTr("Close")
6667
onClicked: {
@@ -69,6 +70,7 @@ D.DialogWindow {
6970
}
7071

7172
D.RecommandButton {
73+
D.ColorSelector.inactived: false
7274
Layout.fillWidth: true
7375
text: qsTr("Export to desktop")
7476
onClicked: {

src/dcc-update-plugin/qml/UpdateSelectDialog.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ D.DialogWindow {
7171

7272
component ButtonWithToolTip: D.Button {
7373
id: customButton
74-
74+
D.ColorSelector.inactived: false
7575
contentItem: Text {
7676
id: buttonText
7777
text: customButton.text

src/dcc-update-plugin/qml/UpdateSetting.qml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ DccObject {
118118
Layout.fillWidth: true
119119
}
120120
D.ToolButton {
121+
D.ColorSelector.inactived: false
121122
textColor: D.Palette {
122123
normal {
123124
common: D.DTK.makeColor(D.Color.Highlight)
@@ -197,6 +198,7 @@ DccObject {
197198
page: RowLayout {
198199
D.LineEdit {
199200
id: lineEdit
201+
D.ColorSelector.inactived: false
200202
maximumLength: 5
201203
validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
202204
alertText: qsTr("Only numbers between 1-99999 are allowed")
@@ -378,6 +380,7 @@ DccObject {
378380
pageType: DccObject.Editor
379381
page: D.Button {
380382
implicitWidth: fm.advanceWidth(text) + fm.averageCharacterWidth * 2
383+
D.ColorSelector.inactived: false
381384
text: qsTr("View")
382385
onClicked: {
383386
dccData.model().historyModel.refreshHistory()
@@ -503,6 +506,7 @@ DccObject {
503506
visible: dccData.model().testingChannelStatus === Common.WaitJoined
504507
pageType: DccObject.Editor
505508
page: D.ToolButton {
509+
D.ColorSelector.inactived: false
506510
text: qsTr("Click here to complete the application")
507511
textColor: D.Palette {
508512
normal {

0 commit comments

Comments
 (0)