summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/test.yml13
-rw-r--r--src/application.rs4
-rw-r--r--web/Cargo.toml2
-rw-r--r--web/src/hasher.rs21
-rw-r--r--web/src/lib.rs4
-rw-r--r--web/src/subscription.rs19
-rw-r--r--web/src/widget/button.rs4
-rw-r--r--web/src/widget/column.rs8
-rw-r--r--web/src/widget/container.rs2
-rw-r--r--web/src/widget/row.rs8
-rw-r--r--web/src/widget/text.rs7
-rw-r--r--web/src/widget/text_input.rs6
-rw-r--r--wgpu/src/text.rs22
13 files changed, 103 insertions, 17 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4f911303..8c5ded3a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
name: Test
on: [push, pull_request]
jobs:
- all:
+ native:
runs-on: ${{ matrix.os }}
strategy:
matrix:
@@ -16,3 +16,14 @@ jobs:
run: |
cargo test --verbose --all
cargo test --verbose --all --all-features
+
+ web:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: hecrj/setup-rust-action@v1
+ with:
+ rust-version: stable
+ targets: wasm32-unknown-unknown
+ - uses: actions/checkout@master
+ - name: Run checks
+ run: cargo check --package iced --target wasm32-unknown-unknown
diff --git a/src/application.rs b/src/application.rs
index 98e160ce..a7e826fb 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -146,12 +146,12 @@ pub trait Application: Sized {
/// It should probably be that last thing you call in your `main` function.
///
/// [`Application`]: trait.Application.html
- fn run(settings: Settings)
+ fn run(_settings: Settings)
where
Self: 'static,
{
#[cfg(not(target_arch = "wasm32"))]
- <Instance<Self> as iced_winit::Application>::run(settings.into());
+ <Instance<Self> as iced_winit::Application>::run(_settings.into());
#[cfg(target_arch = "wasm32")]
<Instance<Self> as iced_web::Application>::run();
diff --git a/web/Cargo.toml b/web/Cargo.toml
index 8c559d73..605c7462 100644
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@@ -15,7 +15,7 @@ categories = ["web-programming"]
maintenance = { status = "actively-developed" }
[dependencies]
-iced_core = { version = "0.1.0", path = "../core", features = ["command"] }
+iced_core = { version = "0.1.0", path = "../core", features = ["command", "subscription"] }
dodrio = "0.1.0"
wasm-bindgen = "0.2.51"
wasm-bindgen-futures = "0.4"
diff --git a/web/src/hasher.rs b/web/src/hasher.rs
new file mode 100644
index 00000000..1a28a2f9
--- /dev/null
+++ b/web/src/hasher.rs
@@ -0,0 +1,21 @@
+use std::collections::hash_map::DefaultHasher;
+
+/// The hasher used to compare subscriptions.
+#[derive(Debug)]
+pub struct Hasher(DefaultHasher);
+
+impl Default for Hasher {
+ fn default() -> Self {
+ Hasher(DefaultHasher::default())
+ }
+}
+
+impl core::hash::Hasher for Hasher {
+ fn write(&mut self, bytes: &[u8]) {
+ self.0.write(bytes)
+ }
+
+ fn finish(&self) -> u64 {
+ self.0.finish()
+ }
+}
diff --git a/web/src/lib.rs b/web/src/lib.rs
index 782bcf93..d4c422d2 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -61,18 +61,22 @@ use std::{cell::RefCell, rc::Rc};
mod bus;
mod element;
+mod hasher;
pub mod style;
+pub mod subscription;
pub mod widget;
pub use bus::Bus;
pub use dodrio;
pub use element::Element;
+pub use hasher::Hasher;
pub use iced_core::{
Align, Background, Color, Command, Font, HorizontalAlignment, Length,
VerticalAlignment,
};
pub use style::Style;
+pub use subscription::Subscription;
pub use widget::*;
/// An interactive web application.
diff --git a/web/src/subscription.rs b/web/src/subscription.rs
new file mode 100644
index 00000000..4638c8ab
--- /dev/null
+++ b/web/src/subscription.rs
@@ -0,0 +1,19 @@
+//! Listen to external events in your application.
+use crate::Hasher;
+
+/// A request to listen to external events.
+///
+/// Besides performing async actions on demand with [`Command`], most
+/// applications also need to listen to external events passively.
+///
+/// A [`Subscription`] is normally provided to some runtime, like a [`Command`],
+/// and it will generate events as long as the user keeps requesting it.
+///
+/// For instance, you can use a [`Subscription`] to listen to a WebSocket
+/// connection, keyboard presses, mouse events, time ticks, etc.
+///
+/// [`Command`]: ../struct.Command.html
+/// [`Subscription`]: struct.Subscription.html
+pub type Subscription<T> = iced_core::Subscription<Hasher, (), T>;
+
+pub use iced_core::subscription::Recipe;
diff --git a/web/src/widget/button.rs b/web/src/widget/button.rs
index 4cc8b3de..e628bd18 100644
--- a/web/src/widget/button.rs
+++ b/web/src/widget/button.rs
@@ -130,6 +130,7 @@ where
) -> dodrio::Node<'b> {
use dodrio::builder::*;
+ let width = style::length(self.width);
let padding_class =
style_sheet.insert(bump, Style::Padding(self.padding));
@@ -149,9 +150,10 @@ where
"style",
bumpalo::format!(
in bump,
- "background: {}; border-radius: {}px; min-width: {}px",
+ "background: {}; border-radius: {}px; width:{}; min-width: {}px",
background,
self.border_radius,
+ width,
self.min_width
)
.into_bump_str(),
diff --git a/web/src/widget/column.rs b/web/src/widget/column.rs
index cc850f5f..e0e49148 100644
--- a/web/src/widget/column.rs
+++ b/web/src/widget/column.rs
@@ -133,6 +133,8 @@ impl<'a, Message> Widget<Message> for Column<'a, Message> {
let width = style::length(self.width);
let height = style::length(self.height);
+ let align_items = style::align(self.align_items);
+
// TODO: Complete styling
div(bump)
.attr(
@@ -142,10 +144,12 @@ impl<'a, Message> Widget<Message> for Column<'a, Message> {
)
.attr("style", bumpalo::format!(
in bump,
- "width: {}; height: {}; max-width: {}px",
+ "width: {}; height: {}; max-width: {}px; max-height: {}px; align-items: {}",
width,
height,
- self.max_width
+ self.max_width,
+ self.max_height,
+ align_items
).into_bump_str()
)
.children(children)
diff --git a/web/src/widget/container.rs b/web/src/widget/container.rs
index 25e4ebf8..bdc88979 100644
--- a/web/src/widget/container.rs
+++ b/web/src/widget/container.rs
@@ -134,7 +134,7 @@ where
impl<'a, Message> From<Container<'a, Message>> for Element<'a, Message>
where
- Message: 'static + Clone,
+ Message: 'static,
{
fn from(container: Container<'a, Message>) -> Element<'a, Message> {
Element::new(container)
diff --git a/web/src/widget/row.rs b/web/src/widget/row.rs
index e47478be..02754e2e 100644
--- a/web/src/widget/row.rs
+++ b/web/src/widget/row.rs
@@ -134,6 +134,8 @@ impl<'a, Message> Widget<Message> for Row<'a, Message> {
let width = style::length(self.width);
let height = style::length(self.height);
+ let justify_content = style::align(self.align_items);
+
// TODO: Complete styling
div(bump)
.attr(
@@ -143,10 +145,12 @@ impl<'a, Message> Widget<Message> for Row<'a, Message> {
)
.attr("style", bumpalo::format!(
in bump,
- "width: {}; height: {}; max-width: {}px",
+ "width: {}; height: {}; max-width: {}px; max-height: {}px; justify-content: {}",
width,
height,
- self.max_width
+ self.max_width,
+ self.max_height,
+ justify_content
).into_bump_str()
)
.children(children)
diff --git a/web/src/widget/text.rs b/web/src/widget/text.rs
index 6194a12e..2fdbc0a6 100644
--- a/web/src/widget/text.rs
+++ b/web/src/widget/text.rs
@@ -119,6 +119,9 @@ impl<'a, Message> Widget<Message> for Text {
let content = bumpalo::format!(in bump, "{}", self.content);
let color = style::color(self.color.unwrap_or(Color::BLACK));
+ let width = style::length(self.width);
+ let height = style::length(self.height);
+
let text_align = match self.horizontal_alignment {
HorizontalAlignment::Left => "left",
HorizontalAlignment::Center => "center",
@@ -127,7 +130,9 @@ impl<'a, Message> Widget<Message> for Text {
let style = bumpalo::format!(
in bump,
- "font-size: {}px; color: {}; text-align: {}",
+ "width: {}; height: {}; font-size: {}px; color: {}; text-align: {}",
+ width,
+ height,
self.size.unwrap_or(20),
color,
text_align
diff --git a/web/src/widget/text_input.rs b/web/src/widget/text_input.rs
index d6357512..99792c84 100644
--- a/web/src/widget/text_input.rs
+++ b/web/src/widget/text_input.rs
@@ -128,6 +128,8 @@ where
use dodrio::builder::*;
use wasm_bindgen::JsCast;
+ let width = style::length(self.width);
+ let max_width = style::length(self.max_width);
let padding_class =
style_sheet.insert(bump, Style::Padding(self.padding));
@@ -143,7 +145,9 @@ where
"style",
bumpalo::format!(
in bump,
- "font-size: {}px",
+ "width: {}; max-width: {}; font-size: {}px",
+ width,
+ max_width,
self.size.unwrap_or(20)
)
.into_bump_str(),
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index e9a1602f..880ad1a6 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -136,11 +136,23 @@ impl Pipeline {
// it uses a lifetimed `GlyphCalculatorGuard` with side-effects on drop.
// This makes stuff quite inconvenient. A manual method for trimming the
// cache would make our lives easier.
- let _ = self
- .measure_brush
- .borrow_mut()
- .process_queued(|_, _| {}, |_| {})
- .expect("Trim text measurements");
+ loop {
+ let action = self
+ .measure_brush
+ .borrow_mut()
+ .process_queued(|_, _| {}, |_| {});
+
+ match action {
+ Ok(_) => break,
+ Err(glyph_brush::BrushError::TextureTooSmall { suggested }) => {
+ let (width, height) = suggested;
+
+ self.measure_brush
+ .borrow_mut()
+ .resize_texture(width, height);
+ }
+ }
+ }
}
pub fn find_font(&self, font: iced_native::Font) -> wgpu_glyph::FontId {
generated by cgit (git 2.34.1) at 2025-04-17 15:35:16 +0000