Skip to content

feat(settings): expose automatic window material #1664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adamanz wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(settings): expose automatic window material #1664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion extra/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
},

// "none", "blur", "liquid_glass", or "auto" (liquid_glass when available, else blur).
// Needs window opacity < 1 to be visible.
// When opacity is unset, liquid glass uses a translucent default automatically.
"material": "auto",

// Corner radius of the launcher window, in pixels.
Expand Down
5 changes: 5 additions & 0 deletions src/server/src/qml/general-settings-model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ static QVariantList wrapSection(const QString &title, const QVariantList &items)

QVariantList GeneralSettingsModel::windowMaterialItems() const {
QVariantList items;
items.append(makeDropdownItem(QStringLiteral("auto"), QStringLiteral("Automatic")));
items.append(makeDropdownItem(QStringLiteral("none"), QStringLiteral("None")));
items.append(makeDropdownItem(QStringLiteral("blur"), QStringLiteral("Blurred")));
if (platform::supports(platform::Capability::LiquidGlass))
Expand All @@ -176,6 +177,10 @@ QVariantList GeneralSettingsModel::windowMaterialItems() const {
}

QVariant GeneralSettingsModel::currentWindowMaterial() const {
if (cfg().launcherWindow.material == "auto") {
return makeDropdownItem(QStringLiteral("auto"), QStringLiteral("Automatic"));
}

auto id = QString::fromStdString(
cfg().launcherWindow.resolvedMaterial(platform::supports(platform::Capability::LiquidGlass),
platform::supports(platform::Capability::WindowMaterial)));
Expand Down
2 changes: 1 addition & 1 deletion src/server/src/qml/qml/AppearanceSettingsPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Flickable {
SettingsRow {
visible: Platform.supports("windowMaterial")
label: "Window material"
description: "Background material applied to the launcher window. Lower the window opacity to see it."
description: "Background material applied to the launcher window. Automatic uses Liquid Glass when available, then falls back to blur."
SearchableDropdown {
width: parent.width
items: root.model.windowMaterialItems
Expand Down