me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'iced-main/master' into feat/multi-window-support

Browse source 
# Conflicts:
#	glutin/src/application.rs
#	winit/src/icon.rs
This commit is contained in:
bungoboingo 2023-02-28 13:08:30 -08:00
commit 51296572c0
16 changed files with 79 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "iced_core"
version = "0.8.0"
version = "0.8.1"
authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
edition = "2021"
description = "The essential concepts of Iced"

3
core/src/alignment.rs
View file

@ -11,9 +11,6 @@ pub enum Alignment {
/// Align at the end of the axis.
End,
/// Fill the entire axis.
Fill,
}
impl From<Horizontal> for Alignment {

10
core/src/padding.rs
View file

@ -77,12 +77,14 @@ impl Padding {
/// Fits the [`Padding`] between the provided `inner` and `outer` [`Size`].
pub fn fit(self, inner: Size, outer: Size) -> Self {
let available = (outer - inner).max(Size::ZERO);
let new_top = self.top.min(available.height);
let new_left = self.left.min(available.width);
Padding {
top: self.top.min(available.height / 2.0),
right: self.right.min(available.width / 2.0),
bottom: self.bottom.min(available.height / 2.0),
left: self.left.min(available.width / 2.0),
top: new_top,
bottom: self.bottom.min(available.height - new_top),
left: new_left,
right: self.right.min(available.width - new_left),
}
}
}

5
examples/component/src/main.rs
View file

@ -127,7 +127,8 @@ mod numeric_input {
.horizontal_alignment(alignment::Horizontal::Center)
.vertical_alignment(alignment::Vertical::Center),
)
.width(50)
.width(40)
.height(40)
.on_press(on_press)
};
@ -145,7 +146,7 @@ mod numeric_input {
.padding(10),
button("+", Event::IncrementPressed),
]
.align_items(Alignment::Fill)
.align_items(Alignment::Center)
.spacing(10)
.into()
}

1
examples/scrollable/src/main.rs
View file

@ -254,7 +254,6 @@ impl Application for ScrollableDemo {
scroll_to_beginning_button(),
vertical_space(40),
]
.align_items(Alignment::Fill)
.spacing(40),
horizontal_space(1200),
text("Horizontal - End!"),

4
examples/websocket/src/main.rs
View file

@ -146,7 +146,9 @@ impl Application for WebSocket {
}
}
row![input, button].spacing(10).align_items(Alignment::Fill)
row![input, button]
.spacing(10)
.align_items(Alignment::Center)
};
column![message_log, new_message_input]

2
glow/src/settings.rs
View file

@ -43,7 +43,7 @@ impl std::fmt::Debug for Settings {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("Settings")
// Instead of printing the font bytes, we simply show a `bool` indicating if using a default font or not.
.field("default_font", &self.default_font.is_none())
.field("default_font", &self.default_font.is_some())
.field("default_text_size", &self.default_text_size)
.field("text_multithreading", &self.text_multithreading)
.field("antialiasing", &self.antialiasing)

2
glutin/src/application.rs
View file

@ -88,7 +88,7 @@ where
settings.id,
);
log::info!("Window builder: {:#?}", builder);
log::debug!("Window builder: {:#?}", builder);
#[allow(unsafe_code)]
let (display, window, surface, context) = unsafe {

12
graphics/Cargo.toml
View file

@ -11,7 +11,7 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
categories = ["gui"]
[features]
svg = ["resvg", "usvg", "tiny-skia"]
svg = ["resvg"]
image = ["png", "jpeg", "jpeg_rayon", "gif", "webp", "bmp"]
png = ["image_rs/png"]
jpeg = ["image_rs/jpeg"]
@ -71,15 +71,7 @@ default-features = false
optional = true
[dependencies.resvg]
version = "0.18"
optional = true
[dependencies.usvg]
version = "0.18"
optional = true
[dependencies.tiny-skia]
version = "0.6"
version = "0.29"
optional = true
[dependencies.kamadak-exif]

17
graphics/src/image/vector.rs
View file

@ -5,6 +5,8 @@ use crate::Color;
use iced_native::svg;
use iced_native::Size;
use resvg::tiny_skia;
use resvg::usvg;
use std::collections::{HashMap, HashSet};
use std::fs;
@ -21,7 +23,7 @@ impl Svg {
pub fn viewport_dimensions(&self) -> Size<u32> {
match self {
Svg::Loaded(tree) => {
let size = tree.svg_node().size;
let size = tree.size;
Size::new(size.width() as u32, size.height() as u32)
}
@ -51,20 +53,14 @@ impl<T: Storage> Cache<T> {
let svg = match handle.data() {
svg::Data::Path(path) => {
let tree = fs::read_to_string(path).ok().and_then(|contents| {
usvg::Tree::from_str(
&contents,
&usvg::Options::default().to_ref(),
)
.ok()
usvg::Tree::from_str(&contents, &usvg::Options::default())
.ok()
});
tree.map(Svg::Loaded).unwrap_or(Svg::NotFound)
}
svg::Data::Bytes(bytes) => {
match usvg::Tree::from_data(
bytes,
&usvg::Options::default().to_ref(),
) {
match usvg::Tree::from_data(bytes, &usvg::Options::default()) {
Ok(tree) => Svg::Loaded(tree),
Err(_) => Svg::NotFound,
}
@ -125,6 +121,7 @@ impl<T: Storage> Cache<T> {
} else {
usvg::FitTo::Height(height)
},
tiny_skia::Transform::default(),
img.as_mut(),
)?;

67
native/src/layout/flex.rs
View file

@ -81,32 +81,6 @@ where
let mut nodes: Vec<Node> = Vec::with_capacity(items.len());
nodes.resize(items.len(), Node::default());
if align_items == Alignment::Fill {
let mut fill_cross = axis.cross(limits.min());
items.iter().for_each(|child| {
let cross_fill_factor = match axis {
Axis::Horizontal => child.as_widget().height(),
Axis::Vertical => child.as_widget().width(),
}
.fill_factor();
if cross_fill_factor == 0 {
let (max_width, max_height) = axis.pack(available, max_cross);
let child_limits =
Limits::new(Size::ZERO, Size::new(max_width, max_height));
let layout = child.as_widget().layout(renderer, &child_limits);
let size = layout.size();
fill_cross = fill_cross.max(axis.cross(size));
}
});
cross = fill_cross;
}
for (i, child) in items.iter().enumerate() {
let fill_factor = match axis {
Axis::Horizontal => child.as_widget().width(),
@ -115,31 +89,16 @@ where
.fill_factor();
if fill_factor == 0 {
let (min_width, min_height) = if align_items == Alignment::Fill {
axis.pack(0.0, cross)
} else {
axis.pack(0.0, 0.0)
};
let (max_width, max_height) = axis.pack(available, max_cross);
let (max_width, max_height) = if align_items == Alignment::Fill {
axis.pack(available, cross)
} else {
axis.pack(available, max_cross)
};
let child_limits = Limits::new(
Size::new(min_width, min_height),
Size::new(max_width, max_height),
);
let child_limits =
Limits::new(Size::ZERO, Size::new(max_width, max_height));
let layout = child.as_widget().layout(renderer, &child_limits);
let size = layout.size();
available -= axis.main(size);
if align_items != Alignment::Fill {
cross = cross.max(axis.cross(size));
}
cross = cross.max(axis.cross(size));
nodes[i] = layout;
} else {
@ -164,17 +123,10 @@ where
max_main
};
let (min_width, min_height) = if align_items == Alignment::Fill {
axis.pack(min_main, cross)
} else {
axis.pack(min_main, axis.cross(limits.min()))
};
let (min_width, min_height) =
axis.pack(min_main, axis.cross(limits.min()));
let (max_width, max_height) = if align_items == Alignment::Fill {
axis.pack(max_main, cross)
} else {
axis.pack(max_main, max_cross)
};
let (max_width, max_height) = axis.pack(max_main, max_cross);
let child_limits = Limits::new(
Size::new(min_width, min_height),
@ -182,10 +134,7 @@ where
);
let layout = child.as_widget().layout(renderer, &child_limits);
if align_items != Alignment::Fill {
cross = cross.max(axis.cross(layout.size()));
}
cross = cross.max(axis.cross(layout.size()));
nodes[i] = layout;
}

6
native/src/layout/node.rs
View file

@ -56,9 +56,6 @@ impl Node {
Alignment::End => {
self.bounds.x += space.width - self.bounds.width;
}
Alignment::Fill => {
self.bounds.width = space.width;
}
}
match vertical_alignment {
@ -69,9 +66,6 @@ impl Node {
Alignment::End => {
self.bounds.y += space.height - self.bounds.height;
}
Alignment::Fill => {
self.bounds.height = space.height;
}
}
}

18
wgpu/src/settings.rs
View file

@ -1,10 +1,12 @@
//! Configure a renderer.
use std::fmt;
pub use crate::Antialiasing;
/// The settings of a [`Backend`].
///
/// [`Backend`]: crate::Backend
#[derive(Debug, Clone, Copy, PartialEq)]
#[derive(Clone, Copy, PartialEq)]
pub struct Settings {
/// The present mode of the [`Backend`].
///
@ -36,6 +38,20 @@ pub struct Settings {
pub antialiasing: Option<Antialiasing>,
}
impl fmt::Debug for Settings {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Settings")
.field("present_mode", &self.present_mode)
.field("internal_backend", &self.internal_backend)
// Instead of printing the font bytes, we simply show a `bool` indicating if using a default font or not.
.field("default_font", &self.default_font.is_some())
.field("default_text_size", &self.default_text_size)
.field("text_multithreading", &self.text_multithreading)
.field("antialiasing", &self.antialiasing)
.finish()
}
}
impl Settings {
/// Creates new [`Settings`] using environment configuration.
///

2
winit/src/application.rs
View file

@ -155,7 +155,7 @@ where
)
.with_visible(false);
log::info!("Window builder: {:#?}", builder);
log::debug!("Window builder: {:#?}", builder);
let window = builder
.build(&event_loop)

8
winit/src/icon.rs
View file

@ -6,9 +6,15 @@ use std::io;
use std::path::Path;
/// The icon of a window.
#[derive(Debug, Clone)]
#[derive(Clone)]
pub struct Icon(winit::window::Icon);
impl fmt::Debug for Icon {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_tuple("Icon").field(&format_args!("_")).finish()
}
}
impl Icon {
/// Creates an icon from 32bpp RGBA data.
pub fn from_rgba(

23
winit/src/settings.rs
View file

@ -24,9 +24,12 @@ pub use platform::PlatformSpecific;
use crate::conversion;
use crate::Icon;
use crate::Position;
use winit::monitor::MonitorHandle;
use winit::window::WindowBuilder;
use std::fmt;
/// The settings of an application.
#[derive(Debug, Clone, Default)]
pub struct Settings<Flags> {
@ -64,7 +67,7 @@ pub struct Settings<Flags> {
}
/// The window settings of an application.
#[derive(Debug, Clone)]
#[derive(Clone)]
pub struct Window {
/// The size of the window.
pub size: (u32, u32),
@ -100,6 +103,24 @@ pub struct Window {
pub platform_specific: platform::PlatformSpecific,
}
impl fmt::Debug for Window {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Window")
.field("size", &self.size)
.field("position", &self.position)
.field("min_size", &self.min_size)
.field("max_size", &self.max_size)
.field("visible", &self.visible)
.field("resizable", &self.resizable)
.field("decorations", &self.decorations)
.field("transparent", &self.transparent)
.field("always_on_top", &self.always_on_top)
.field("icon", &self.icon.is_some())
.field("platform_specific", &self.platform_specific)
.finish()
}
}
impl Window {
/// Converts the window settings into a `WindowBuilder` from `winit`.
pub fn into_builder(