language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 18:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reduce the size/alignment of Image

Browse source 
Use u32 for the timestamp store as the cache key, this is enough
precision so that there is no practical risk of ducplicates

And remove the Path from no_std as this is not used in this version
This commit is contained in:
Olivier Goffart 2025-05-21 10:28:30 +02:00
parent de9eb69f60
commit 01e6177d08
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
internal/core/graphics/image.rs
View file

@ -7,6 +7,7 @@ This module contains image decoding and caching related types for the run-time l
use crate::lengths::{PhysicalPx, ScaleFactor};
use crate::slice::Slice;
#[allow(unused)]
use crate::{SharedString, SharedVector};
use super::{IntRect, IntSize};
@ -288,21 +289,22 @@ pub struct StaticTextures {
/// time of the file it points to.
#[derive(PartialEq, Eq, Debug, Hash, Clone)]
#[repr(C)]
#[cfg(feature = "std")]
pub struct CachedPath {
path: SharedString,
/// SystemTime since UNIX_EPOC as secs
last_modified: u64,
last_modified: u32,
}
#[cfg(feature = "std")]
impl CachedPath {
#[cfg(feature = "std")]
fn new<P: AsRef<std::path::Path>>(path: P) -> Self {
let path_str = SharedString::from(path.as_ref().to_string_lossy().as_ref());
let path_str = path.as_ref().to_string_lossy().as_ref().into();
let timestamp = std::fs::metadata(path)
.and_then(|md| md.modified())
.unwrap_or(std::time::UNIX_EPOCH)
.duration_since(std::time::UNIX_EPOCH)
.map(|t| t.as_secs())
.map(|t| t.as_secs() as u32)
.unwrap_or_default();
Self { path: path_str, last_modified: timestamp }
}
@ -316,6 +318,7 @@ pub enum ImageCacheKey {
/// This variant indicates that no image cache key can be created for the image.
/// For example this is the case for programmatically created images.
Invalid = 0,
#[cfg(feature = "std")]
/// The image is identified by its path on the file system and the last modification time stamp.
Path(CachedPath) = 1,
/// The image is identified by a URL.
@ -1341,11 +1344,13 @@ pub(crate) mod ffi {
pub extern "C" fn slint_image_path(image: &Image) -> Option<&SharedString> {
match &image.0 {
ImageInner::EmbeddedImage { cache_key, .. } => match cache_key {
#[cfg(feature = "std")]
ImageCacheKey::Path(CachedPath { path, .. }) => Some(path),
_ => None,
},
ImageInner::NineSlice(nine) => match &nine.0 {
ImageInner::EmbeddedImage { cache_key, .. } => match cache_key {
#[cfg(feature = "std")]
ImageCacheKey::Path(CachedPath { path, .. }) => Some(path),
_ => None,
},