dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

calendar: Differentiate text color of disabled and non-current month (#668)

Browse source 
| Before | After |
| - | - |
| <img width="341" alt="image"
src="https://github.com/user-attachments/assets/452d57b1-5ec6-4ad3-bc30-ed8a966d12e5"
/> | <img width="350" alt="image"
src="https://github.com/user-attachments/assets/9f664cea-aa55-479a-8d5b-61570101a66f"
/> |
This commit is contained in:
Floyd Wang 2025-02-27 11:14:28 +08:00 committed by GitHub
parent 3ba63915ce
commit e61f6204cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/story/src/calendar_story.rs
View file

@ -96,7 +96,11 @@ impl CalendarStory {
window, window,
cx, cx,
); );
picker.set_date(now, window, cx); picker.set_date(
now.checked_sub_days(Days::new(1)).unwrap_or_default(),
window,
cx,
);
picker picker
}); });
let date_picker_small = cx.new(|cx| { let date_picker_small = cx.new(|cx| {

8
crates/ui/src/time/calendar.rs
View file

@ -161,7 +161,7 @@ pub enum Matcher {
/// Match declare days of the week. /// Match declare days of the week.
/// ///
/// Matcher::DayOfWeek(vec![0, 6]) /// Matcher::DayOfWeek(vec![0, 6])
/// @ill match the days of the week that are Sunday and Saturday. /// Will match the days of the week that are Sunday and Saturday.
DayOfWeek(Vec<u32>), DayOfWeek(Vec<u32>),
/// Match the included days, except for those before and after the interval. /// Match the included days, except for those before and after the interval.
/// ///
@ -481,7 +481,11 @@ impl Calendar {
} }
}) })
.when(muted, |this| { .when(muted, |this| {
this.text_color(cx.theme().muted_foreground.opacity(0.3)) this.text_color(if disabled {
cx.theme().muted_foreground.opacity(0.3)
} else {
cx.theme().muted_foreground
})
}) })
.when(secondary_active, |this| { .when(secondary_active, |this| {
this.bg(if muted { this.bg(if muted {