diff options
| -rw-r--r-- | .github/ISSUE_TEMPLATE/BUG-REPORT.yml | 4 | ||||
| -rw-r--r-- | examples/styling/src/main.rs | 4 | ||||
| -rw-r--r-- | runtime/src/overlay/nested.rs | 2 | ||||
| -rw-r--r-- | tiny_skia/fonts/Iced-Icons.ttf | bin | 0 -> 5108 bytes | |||
| -rw-r--r-- | tiny_skia/src/text.rs | 3 | ||||
| -rw-r--r-- | widget/Cargo.toml | 2 | ||||
| -rw-r--r-- | widget/src/lazy.rs | 6 | ||||
| -rw-r--r-- | winit/Cargo.toml | 2 |
8 files changed, 10 insertions, 13 deletions
diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml index 9d2ed825..d4c94fcd 100644 --- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml @@ -69,8 +69,8 @@ body: - type: dropdown id: os attributes: - label: Operative System - description: Which operative system are you using? + label: Operating System + description: Which operating system are you using? options: - Windows - macOS diff --git a/examples/styling/src/main.rs b/examples/styling/src/main.rs index e2015bac..f8a4c80a 100644 --- a/examples/styling/src/main.rs +++ b/examples/styling/src/main.rs @@ -127,7 +127,9 @@ impl Sandbox for Styling { let content = column![ choose_theme, horizontal_rule(38), - row![text_input, button].spacing(10), + row![text_input, button] + .spacing(10) + .align_items(Alignment::Center), slider, progress_bar, row![ diff --git a/runtime/src/overlay/nested.rs b/runtime/src/overlay/nested.rs index cd258ab6..b729f769 100644 --- a/runtime/src/overlay/nested.rs +++ b/runtime/src/overlay/nested.rs @@ -42,7 +42,7 @@ where where Renderer: renderer::Renderer, { - let translation = position - element.position(); + let translation = position - Point::ORIGIN; let node = element.layout(renderer, bounds, translation); diff --git a/tiny_skia/fonts/Iced-Icons.ttf b/tiny_skia/fonts/Iced-Icons.ttf Binary files differnew file mode 100644 index 00000000..e3273141 --- /dev/null +++ b/tiny_skia/fonts/Iced-Icons.ttf diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs index 6ff797db..3441da8f 100644 --- a/tiny_skia/src/text.rs +++ b/tiny_skia/src/text.rs @@ -22,8 +22,7 @@ impl Pipeline { Pipeline { font_system: RefCell::new(cosmic_text::FontSystem::new_with_fonts( [cosmic_text::fontdb::Source::Binary(Arc::new( - include_bytes!("../../wgpu/fonts/Iced-Icons.ttf") - .as_slice(), + include_bytes!("../fonts/Iced-Icons.ttf").as_slice(), ))] .into_iter(), )), diff --git a/widget/Cargo.toml b/widget/Cargo.toml index 40e4db37..14aae72e 100644 --- a/widget/Cargo.toml +++ b/widget/Cargo.toml @@ -28,7 +28,7 @@ version = "0.8" path = "../style" [dependencies.ouroboros] -version = "0.13" +version = "0.17" optional = true [dependencies.qrcode] diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs index 4903d0ed..da287f06 100644 --- a/widget/src/lazy.rs +++ b/widget/src/lazy.rs @@ -279,11 +279,7 @@ where } #[self_referencing] -struct Inner<'a, Message, Renderer> -where - Message: 'a, - Renderer: 'a, -{ +struct Inner<'a, Message: 'a, Renderer: 'a> { cell: Rc<RefCell<Option<Element<'static, Message, Renderer>>>>, element: Element<'static, Message, Renderer>, tree: &'a mut Tree, diff --git a/winit/Cargo.toml b/winit/Cargo.toml index b75b1929..de7c1c62 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -31,7 +31,7 @@ raw-window-handle = "0.5" [dependencies.winit] version = "0.28" git = "https://github.com/iced-rs/winit.git" -rev = "ac1ddfe0bd870910b3aa64a18d386fdd55b30a1d" +rev = "c52db2045d0a2f1b8d9923870de1d4ab1994146e" default-features = false [dependencies.iced_runtime] |