Skip to content
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

Jump to bottom

fix #280 #315

Merged
merged 2 commits into from
May 8, 2024
Merged

fix #280 #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3144a12
fix: phira-monitor
Licapule May 8, 2024
af452e9
fix: touch button when fading
May 8, 2024
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 phira-monitor/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ async fn the_main() -> Result<()> {
let _guard = rt.enter();

let font = FontArc::try_from_vec(load_file("font.ttf").await?)?;
let mut painter = TextPainter::new(font);
let mut painter = TextPainter::new(font, None);

let config: Config = (|| -> Result<Config> { Ok(serde_yaml::from_reader(File::open("monitor-config.yml")?)?) })().context("读取配置失败")?;

Expand Down
3 changes: 3 additions & 0 deletions phira/src/scene/profile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ impl Scene for ProfileScene {
}

fn touch(&mut self, tm: &mut TimeManager, touch: &Touch) -> Result<bool> {
if self.sf.transiting() {
return Ok(true);
}
if self.avatar_task.is_some() {
return Ok(true);
}
Expand Down