Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Column {
]
readonly property var mediaStyleOptions: [
{ value: "default", label: "Default" },
{ value: "full", label: "Full" }
{ value: "full", label: "Compact" }
]
readonly property var v1CompactGroupIds: [
"G4", "G5", "G6", "G11", "G12", "G13", "G14", "G15", "G18"
Expand Down
2 changes: 1 addition & 1 deletion tests/control-center-regression.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1764,7 +1764,7 @@ for profile_icon_contract in \
'WidgetAppearanceWorkbench.qml:{ value: "full", label: "Icon + text" }' \
'WidgetAppearanceWorkbench.qml:{ value: "text", label: "Text" }' \
'WidgetAppearanceWorkbench.qml:readonly property var mediaStyleOptions:' \
'WidgetAppearanceWorkbench.qml:{ value: "full", label: "Full" }' \
'WidgetAppearanceWorkbench.qml:{ value: "full", label: "Compact" }' \
'WidgetAppearanceWorkbench.qml:readonly property var v1CompactGroupIds:' \
'WidgetAppearanceWorkbench.qml:if (catalogGroup === "G9") return mediaStyleOptions' \
'WidgetAppearanceWorkbench.qml:if (controller.v2LayoutActive === true) return displayModeOptions' \
Expand Down
14 changes: 12 additions & 2 deletions tests/control-center-smoke.qml
Original file line number Diff line number Diff line change
Expand Up @@ -687,11 +687,16 @@ ShellRoot {
appearance.showWidgetOverview()
if (!appearance.openWidgetDetails("G9", "")
|| appearance.selectedWidgetMode !== "default"
|| appearance.selectedWidgetModeOptions.length !== 2
|| appearance.selectedWidgetModeOptions[0].value !== "default"
|| appearance.selectedWidgetModeOptions[0].label !== "Default"
|| appearance.selectedWidgetModeOptions[1].value !== "full"
|| appearance.selectedWidgetModeOptions[1].label !== "Compact"
|| !appearance.cycleSelectedWidgetMode()
|| appearance.selectedWidgetMode !== "full"
|| stateService.groupAppearanceSettingForVariant(
"G9", "v2", "mediaStyle", "") !== "default")
return root.fail("V1 Now Playing style contract drifted")
return root.fail("V1 Now Playing Default/Compact contract drifted")
if (!appearance.cycleSelectedWidgetMode()
|| appearance.selectedWidgetMode !== "default")
return root.fail("V1 Now Playing style did not restore")
Expand Down Expand Up @@ -721,11 +726,16 @@ ShellRoot {
panel.v2LayoutActive = true
if (!appearance.openWidgetDetails("G9", "")
|| appearance.selectedWidgetMode !== "default"
|| appearance.selectedWidgetModeOptions.length !== 2
|| appearance.selectedWidgetModeOptions[0].value !== "default"
|| appearance.selectedWidgetModeOptions[0].label !== "Default"
|| appearance.selectedWidgetModeOptions[1].value !== "full"
|| appearance.selectedWidgetModeOptions[1].label !== "Compact"
|| !appearance.cycleSelectedWidgetMode()
|| appearance.selectedWidgetMode !== "full"
|| stateService.groupAppearanceSettingForVariant(
"G9", "v1", "mediaStyle", "") !== "default")
return root.fail("V2 Now Playing style contract drifted")
return root.fail("V2 Now Playing Default/Compact contract drifted")
if (!appearance.openWidgetDetails("G4", "")
|| appearance.selectedWidgetMode !== "full")
return root.fail("V2 appearance did not remain independent")
Expand Down