Skip to content

Upgrade dark-light to v2 #2724

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
hecrj merged 4 commits into from
Jan 14, 2025
Merged

Upgrade dark-light to v2 #2724

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb19e15
`dark-light`: 1 -> 2 (in root Cargo.toml)
Rudxain Jan 9, 2025
b0f8605
migrate core::theme to `dark-light` v2
Rudxain Jan 9, 2025
2f23302
Update `Cargo.lock`
hecrj Jan 14, 2025
6fb7ec6
Use `unwrap_or` in `Theme::default`
hecrj Jan 14, 2025
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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ bitflags = "2.0"
bytemuck = { version = "1.0", features = ["derive"] }
bytes = "1.6"
cosmic-text = "0.12"
dark-light = "1.0"
dark-light = "2.0"
futures = "0.3"
glam = "0.25"
glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "09712a70df7431e9a3b1ac1bbd4fb634096cb3b4" }
Expand Down
13 changes: 6 additions & 7 deletions core/src/theme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,12 @@ impl Default for Theme {
{
use std::sync::LazyLock;

static DEFAULT: LazyLock<Theme> =
LazyLock::new(|| match dark_light::detect() {
dark_light::Mode::Dark => Theme::Dark,
dark_light::Mode::Light | dark_light::Mode::Default => {
Theme::Light
}
});
static DEFAULT: LazyLock<Theme> = LazyLock::new(|| match dark_light::detect() {
Ok(dark_light::Mode::Dark) => Theme::Dark,
Ok(dark_light::Mode::Light) | Ok(dark_light::Mode::Unspecified) | Err(_) => {
Theme::Light
Copy link
Contributor

@T-256 T-256 Jan 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Ok(dark_light::Mode::Light) | Ok(dark_light::Mode::Unspecified) | Err(_) => {
Theme::Light
_ => Theme::Light,

Copy link
Contributor Author

@Rudxain Rudxain Jan 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally I would've made this change before even opening the PR, but I decided to preserve the verbosity of the original just-in-case there's a reason for the verbosity

}
});

DEFAULT.clone()
}
Expand Down