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

Improve sixtyfps::Image::size() API for consistency

Browse source 
Make size() return an unsigned integer size type instead of floats.

cc #431
This commit is contained in:
Simon Hausmann 2022-01-27 21:35:05 +01:00 • committed by Simon Hausmann
parent d16a335bc4
commit f31f4201c6
11 changed files with 84 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sixtyfps_runtime/rendering_backends/qt/lib.rs
View file

@ -16,7 +16,7 @@ only be used with `version = "=x.y.z"` in Cargo.toml.
extern crate alloc;
use sixtyfps_corelib::graphics::{Image, Size};
use sixtyfps_corelib::graphics::{Image, IntSize};
#[cfg(not(no_qt))]
use sixtyfps_corelib::items::ImageFit;
use sixtyfps_corelib::window::Window;
@ -267,19 +267,17 @@ impl sixtyfps_corelib::backend::Backend for Backend {
};
}
fn image_size(&'static self, _image: &Image) -> Size {
fn image_size(&'static self, _image: &Image) -> IntSize {
#[cfg(not(no_qt))]
{
let inner: &ImageInner = _image.into();
match inner {
sixtyfps_corelib::ImageInner::None => Default::default(),
sixtyfps_corelib::ImageInner::EmbeddedImage(buffer) => {
[buffer.width() as _, buffer.height() as _].into()
}
sixtyfps_corelib::ImageInner::EmbeddedImage(buffer) => buffer.size(),
_ => qt_window::load_image_from_resource(inner, None, ImageFit::fill)
.map(|img| {
let qsize = img.size();
euclid::size2(qsize.width as f32, qsize.height as f32)
euclid::size2(qsize.width, qsize.height)
})
.unwrap_or_default(),
}