Skip to content

Use dark wallpaper #1709

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

Merged
danirabbit merged 4 commits into from
Jul 18, 2023
Merged

Use dark wallpaper #1709

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b544ab7
Use dark wallpaper
lenemter Jul 4, 2023
e8148c1
Fallback to light wallpaper
lenemter Jul 4, 2023
a49ebf8
Merge branch 'master' into use-dark-wallpaper
danirabbit Jul 18, 2023
df0a109
Merge branch 'master' into use-dark-wallpaper
danirabbit Jul 18, 2023
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
28 changes: 23 additions & 5 deletions src/Background/BackgroundSource.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace Gala {
"picture-opacity",
"picture-options",
"picture-uri",
"picture-uri-dark",
"primary-color",
"secondary-color"
};
Expand Down Expand Up @@ -67,6 +68,9 @@ namespace Gala {
}
}
});

unowned var granite_settings = Granite.Settings.get_default ();
granite_settings.notify["prefers-color-scheme"].connect (() => changed ());
}

private void monitors_changed () {
Expand All @@ -91,11 +95,7 @@ namespace Gala {

var style = settings.get_enum ("picture-options");
if (style != GDesktop.BackgroundStyle.NONE) {
var uri = settings.get_string ("picture-uri");
if (Uri.parse_scheme (uri) != null)
filename = File.new_for_uri (uri).get_path ();
else
filename = uri;
filename = get_background_path ();
}

// Animated backgrounds are (potentially) per-monitor, since
Expand All @@ -114,6 +114,24 @@ namespace Gala {
return backgrounds[monitor_index];
}

private string get_background_path () {
if (Granite.Settings.get_default ().prefers_color_scheme == DARK) {
var uri = settings.get_string ("picture-uri-dark");
var path = File.new_for_uri (uri).get_path ();
if (FileUtils.test (path, EXISTS)) {
return path;
}
}

var uri = settings.get_string ("picture-uri");
var path = File.new_for_uri (uri).get_path ();
if (FileUtils.test (path, EXISTS)) {
return path;
}

return uri;
}

private void background_changed (Background background) {
background.changed.disconnect (background_changed);
background.destroy ();
Expand Down