language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 14:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Rename ImageReference to ImageInner and make Immage.0 private

Browse source
This commit is contained in:
Olivier Goffart 2021-05-28 16:17:42 +02:00 • committed by Olivier Goffart
parent 8e44ac2351
commit 142a8dc185
14 changed files with 68 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sixtyfps_runtime/rendering_backends/testing/lib.rs
View file

@ -21,7 +21,7 @@ use sixtyfps_corelib::component::ComponentRc;
use sixtyfps_corelib::graphics::{FontMetrics, Size};
use sixtyfps_corelib::slice::Slice;
use sixtyfps_corelib::window::{ComponentWindow, PlatformWindow, Window};
use sixtyfps_corelib::{ImageReference, Property};
use sixtyfps_corelib::{ImageInner, Property};
use std::path::Path;
use std::pin::Pin;
use std::rc::Rc;
@ -125,19 +125,19 @@ impl PlatformWindow for TestingWindow {
Box::new(TestingFontMetrics::default())
}
fn image_size(&self, source: &ImageReference) -> Size {
fn image_size(&self, source: &ImageInner) -> Size {
match source {
ImageReference::None => Default::default(),
ImageReference::EmbeddedRgbaImage { width, height, .. } => {
ImageInner::None => Default::default(),
ImageInner::EmbeddedRgbaImage { width, height, .. } => {
Size::new(*width as _, *height as _)
}
ImageReference::AbsoluteFilePath(path) => image::open(Path::new(path.as_str()))
ImageInner::AbsoluteFilePath(path) => image::open(Path::new(path.as_str()))
.map(|img| {
let dim = img.dimensions();
Size::new(dim.0 as _, dim.1 as _)
})
.unwrap_or_default(),
ImageReference::EmbeddedData(data) => image::load_from_memory(data.as_slice())
ImageInner::EmbeddedData(data) => image::load_from_memory(data.as_slice())
.map(|img| {
let dim = img.dimensions();
Size::new(dim.0 as _, dim.1 as _)