diff --git a/containments/homescreens/folio/qml/FolioHomeScreen.qml b/containments/homescreens/folio/qml/FolioHomeScreen.qml index 90190baa..e43953b7 100644 --- a/containments/homescreens/folio/qml/FolioHomeScreen.qml +++ b/containments/homescreens/folio/qml/FolioHomeScreen.qml @@ -493,6 +493,7 @@ Item { // don't show in settings mode opacity: 1 - folio.HomeScreenState.settingsOpenProgress + visible: opacity > 0 && !ShellSettings.Settings.convergenceModeEnabled anchors.top: parent.top anchors.left: parent.left diff --git a/tests/check-convergence-dock-invariant.sh b/tests/check-convergence-dock-invariant.sh index 25ebfb97..1efde31f 100644 --- a/tests/check-convergence-dock-invariant.sh +++ b/tests/check-convergence-dock-invariant.sh @@ -176,6 +176,12 @@ require_line "$folio_home" "height: ShellSettings.Settings.convergenceModeEnable require_line "$folio_home" "&& !ShellSettings.Settings.convergenceModeEnabled" require_line "$folio_backend" "Q_PROPERTY(bool overviewActive READ overviewActive NOTIFY overviewActiveChanged)" +homescreen_convergence_hidden_count="$(grep -F "visible: opacity > 0 && !ShellSettings.Settings.convergenceModeEnabled" "$folio_home" | wc -l)" +if [[ "$homescreen_convergence_hidden_count" -ne 2 ]]; then + echo "Expected favourites bar and page indicator wrapper to hide in convergence; found $homescreen_convergence_hidden_count guards" >&2 + exit 1 +fi + overview_hide_guards="$(grep -F "&& !folio.overviewActive" "$folio_main" | wc -l)" if [[ "$overview_hide_guards" -ne 1 ]]; then echo "Expected Folio convergence chrome to hide during KWin Overview; found $overview_hide_guards overview guards" >&2