Skip to content

Commit

Permalink
Merge pull request #2223 from brianch/fix-sysinfo-example
Browse files Browse the repository at this point in the history
Small fix to the Information struct docs and fix memory info. in the system_information example.
  • Loading branch information
hecrj authored Feb 2, 2024
2 parents aea1725 + aa153d0 commit 1049fbb
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Clippy map transformations. [#2090](https://github.com/iced-rs/iced/pull/2090)
- Inline format args for ease of reading. [#2089](https://github.com/iced-rs/iced/pull/2089)
- Stuck scrolling in `Scrollable` with touch events. [#1940](https://github.com/iced-rs/iced/pull/1940)
- Incorrect unit in `system::Information`. [#2223](https://github.com/iced-rs/iced/pull/2223)

Many thanks to...

Expand All @@ -89,6 +90,7 @@ Many thanks to...
- @arslee07
- @AustinMReppert
- @avsaase
- @brianch
- @bungoboingo
- @Calastrophe
- @casperstorm
Expand All @@ -114,6 +116,7 @@ Many thanks to...
- @nyurik
- @Remmirad
- @ripytide
- @Tahinli
- @tarkah
- @tzemanovic
- @william-shere
Expand Down
8 changes: 4 additions & 4 deletions examples/system_information/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,19 @@ impl Application for Example {
));

let memory_readable =
ByteSize::kb(information.memory_total).to_string();
ByteSize::b(information.memory_total).to_string();

let memory_total = text(format!(
"Memory (total): {} kb ({memory_readable})",
"Memory (total): {} bytes ({memory_readable})",
information.memory_total,
));

let memory_text = if let Some(memory_used) =
information.memory_used
{
let memory_readable = ByteSize::kb(memory_used).to_string();
let memory_readable = ByteSize::b(memory_used).to_string();

format!("{memory_used} kb ({memory_readable})")
format!("{memory_used} bytes ({memory_readable})")
} else {
String::from("None")
};
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/system/information.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ pub struct Information {
pub cpu_brand: String,
/// The number of physical cores on the processor
pub cpu_cores: Option<usize>,
/// Total RAM size, KB
/// Total RAM size, in bytes
pub memory_total: u64,
/// Memory used by this process, KB
/// Memory used by this process, in bytes
pub memory_used: Option<u64>,
/// Underlying graphics backend for rendering
pub graphics_backend: String,
Expand Down

0 comments on commit 1049fbb

Please sign in to comment.