Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into android-make-volume-buttons-unhandled
Browse files Browse the repository at this point in the history
Hoodad committed Apr 11, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 8da4360 + 2486f0f commit 7ff041b
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ And please only add new entries to the top of this list, right below the `# Unre
- Bump MSRV from `1.60` to `1.64`.
- On Android, changed default behavior of Android to ignore volume keys letting the operating system handle them.
- On Android, added `EventLoopBuilderExtAndroid::handle_volume_keys` to indicate that the application will handle the volume keys manually.
- On macOS, fixed potential panic when getting refresh rate.

# 0.28.3

4 changes: 3 additions & 1 deletion src/platform_impl/macos/monitor.rs
Original file line number Diff line number Diff line change
@@ -230,7 +230,9 @@ impl MonitorHandle {
return None;
}

Some((time.time_scale as i64 / time.time_value * 1000) as u32)
(time.time_scale as i64)
.checked_div(time.time_value)
.map(|v| (v * 1000) as u32)
}
}

0 comments on commit 7ff041b

Please sign in to comment.