diff --git a/Cargo.lock b/Cargo.lock
index dd3236ca..9cb1393b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -33,17 +33,6 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
-[[package]]
-name = "aes"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
[[package]]
name = "ahash"
version = "0.8.12"
@@ -152,9 +141,6 @@ name = "arbitrary"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
-dependencies = [
- "derive_arbitrary",
-]
[[package]]
name = "arc"
@@ -680,25 +666,6 @@ version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e93abca9e28e0a1b9877922aacb20576e05d4679ffa78c3d6dc22a26a216659"
-[[package]]
-name = "bzip2"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47"
-dependencies = [
- "bzip2-sys",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.13+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
[[package]]
name = "cairo-sys-rs"
version = "0.18.2"
@@ -743,9 +710,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.2.24"
+version = "1.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7"
+checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951"
dependencies = [
"jobserver",
"libc",
@@ -842,16 +809,6 @@ dependencies = [
"half",
]
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
[[package]]
name = "clap"
version = "4.5.39"
@@ -995,12 +952,6 @@ dependencies = [
"web-sys",
]
-[[package]]
-name = "constant_time_eq"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
-
[[package]]
name = "core-foundation"
version = "0.9.4"
@@ -1115,21 +1066,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "crc"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
-
[[package]]
name = "crc32fast"
version = "1.4.2"
@@ -1291,12 +1227,6 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
-[[package]]
-name = "deflate64"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
-
[[package]]
name = "deranged"
version = "0.4.0"
@@ -1306,17 +1236,6 @@ dependencies = [
"powerfmt",
]
-[[package]]
-name = "derive_arbitrary"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "digest"
version = "0.10.7"
@@ -1325,7 +1244,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
"crypto-common",
- "subtle",
]
[[package]]
@@ -1963,11 +1881,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
dependencies = [
"cfg-if",
- "js-sys",
"libc",
"r-efi",
"wasi 0.14.2+wasi-0.2.4",
- "wasm-bindgen",
]
[[package]]
@@ -2253,12 +2169,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
[[package]]
name = "hermit-abi"
version = "0.5.1"
@@ -2277,15 +2187,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
[[package]]
name = "home"
version = "0.5.11"
@@ -2555,27 +2456,12 @@ name = "iced_devtools"
version = "0.14.0-dev"
dependencies = [
"iced_debug",
- "iced_fontello",
"iced_program",
"iced_test",
"iced_widget",
"log",
]
-[[package]]
-name = "iced_fontello"
-version = "0.14.0-dev"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1d2a83ec8063a28ddc818b018c2901a83fa7b773031b691dc80dd32cdb8f32"
-dependencies = [
- "reqwest",
- "serde",
- "serde_json",
- "sha2",
- "toml",
- "zip",
-]
-
[[package]]
name = "iced_futures"
version = "0.14.0-dev"
@@ -2896,15 +2782,6 @@ dependencies = [
"hashbrown",
]
-[[package]]
-name = "inout"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
-dependencies = [
- "generic-array",
-]
-
[[package]]
name = "integration"
version = "0.1.0"
@@ -2962,7 +2839,7 @@ version = "0.4.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
dependencies = [
- "hermit-abi 0.5.1",
+ "hermit-abi",
"libc",
"windows-sys 0.59.0",
]
@@ -3319,27 +3196,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "lzma-rs"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e"
-dependencies = [
- "byteorder",
- "crc",
-]
-
-[[package]]
-name = "lzma-sys"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
[[package]]
name = "malloc_buf"
version = "0.0.6"
@@ -3708,11 +3564,11 @@ dependencies = [
[[package]]
name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
"libc",
]
@@ -4243,16 +4099,6 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
-[[package]]
-name = "pbkdf2"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
-dependencies = [
- "digest",
- "hmac",
-]
-
[[package]]
name = "percent-encoding"
version = "2.3.1"
@@ -4437,7 +4283,7 @@ checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50"
dependencies = [
"cfg-if",
"concurrent-queue",
- "hermit-abi 0.5.1",
+ "hermit-abi",
"pin-project-lite",
"rustix 1.0.7",
"tracing",
@@ -4840,14 +4686,13 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
[[package]]
name = "reqwest"
-version = "0.12.18"
+version = "0.12.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e98ff6b0dbbe4d5a37318f433d4fc82babd21631f194d370409ceb2e40b2f0b5"
+checksum = "a2f8e5513d63f2e5b386eb5106dc67eaf3f84e95258e210489136b8b92ad6119"
dependencies = [
"base64 0.22.1",
"bytes",
"encoding_rs",
- "futures-channel",
"futures-core",
"futures-util",
"h2 0.4.10",
@@ -4862,7 +4707,6 @@ dependencies = [
"js-sys",
"log",
"mime",
- "mime_guess",
"native-tls",
"once_cell",
"percent-encoding",
@@ -6067,16 +5911,9 @@ dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_write",
"winnow",
]
-[[package]]
-name = "toml_write"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
-
[[package]]
name = "tooltip"
version = "0.1.0"
@@ -6112,9 +5949,9 @@ dependencies = [
[[package]]
name = "tower-http"
-version = "0.6.4"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e"
+checksum = "5cc2d9e086a412a451384326f521c8123a99a466b329941a9403696bff9b0da2"
dependencies = [
"bitflags 2.9.1",
"bytes",
@@ -7596,15 +7433,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
-[[package]]
-name = "xz2"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
-dependencies = [
- "lzma-sys",
-]
-
[[package]]
name = "yaml-rust"
version = "0.4.5"
@@ -7762,20 +7590,6 @@ name = "zeroize"
version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
[[package]]
name = "zerotrie"
@@ -7810,76 +7624,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "zip"
-version = "2.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50"
-dependencies = [
- "aes",
- "arbitrary",
- "bzip2",
- "constant_time_eq",
- "crc32fast",
- "crossbeam-utils",
- "deflate64",
- "displaydoc",
- "flate2",
- "getrandom 0.3.3",
- "hmac",
- "indexmap",
- "lzma-rs",
- "memchr",
- "pbkdf2",
- "sha1",
- "thiserror 2.0.12",
- "time",
- "xz2",
- "zeroize",
- "zopfli",
- "zstd",
-]
-
-[[package]]
-name = "zopfli"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7"
-dependencies = [
- "bumpalo",
- "crc32fast",
- "log",
- "simd-adler32",
-]
-
-[[package]]
-name = "zstd"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.15+zstd.1.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
[[package]]
name = "zune-core"
version = "0.4.12"
diff --git a/Cargo.toml b/Cargo.toml
index 1e7ef4e1..2d9beb5f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,6 +45,8 @@ lazy = ["iced_widget/lazy"]
debug = ["iced_winit/debug", "iced_devtools"]
# Enables time-travel debugging (very experimental!)
time-travel = ["debug", "iced_devtools/time-travel"]
+# Enables the tester developer tool for recording and playing tests (press F12)
+tester = ["debug", "iced_devtools/tester"]
# Enables the `thread-pool` futures executor as the `executor::Default` on native platforms
thread-pool = ["iced_futures/thread-pool"]
# Enables `tokio` as the `executor::Default` on native platforms
diff --git a/devtools/Cargo.toml b/devtools/Cargo.toml
index fab9128d..98f83745 100644
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -15,14 +15,13 @@ workspace = true
[features]
time-travel = ["iced_program/time-travel"]
+tester = ["dep:iced_test"]
[dependencies]
iced_debug.workspace = true
iced_program.workspace = true
-iced_test.workspace = true
iced_widget.workspace = true
-
log.workspace = true
-[build-dependencies]
-iced_fontello = "0.14.0-dev"
+iced_test.workspace = true
+iced_test.optional = true
diff --git a/devtools/build.rs b/devtools/build.rs
deleted file mode 100644
index 5bcfd41b..00000000
--- a/devtools/build.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![allow(missing_docs)]
-fn main() {
- // println!("cargo::rerun-if-changed=fonts/iced_devtools-icons.toml");
-
- // iced_fontello::build("fonts/iced_devtools-icons.toml")
- // .expect("Build icons font");
-}
diff --git a/devtools/src/icon.rs b/devtools/src/icon.rs
index cd7f1b58..27ceb9b7 100644
--- a/devtools/src/icon.rs
+++ b/devtools/src/icon.rs
@@ -1,6 +1,4 @@
-// Generated automatically by iced_fontello at build time.
-// Do not edit manually. Source: ../fonts/iced_devtools-icons.toml
-// 3139a163a989c992b8f038da359b59e9292fc49f031e760b61a8d76e2037aee2
+#![allow(unused)]
use crate::core::Font;
use crate::program;
use crate::widget::{Text, text};
diff --git a/devtools/src/lib.rs b/devtools/src/lib.rs
index d516d075..151b5c93 100644
--- a/devtools/src/lib.rs
+++ b/devtools/src/lib.rs
@@ -1,6 +1,7 @@
#![allow(missing_docs)]
use iced_debug as debug;
use iced_program as program;
+#[cfg(feature = "tester")]
use iced_test as test;
use iced_widget::core;
use iced_widget::runtime;
@@ -12,26 +13,29 @@ mod icon;
mod time_machine;
mod widget;
-use crate::core::alignment::Horizontal::Right;
+#[cfg(feature = "tester")]
+mod tester;
+
+#[cfg(not(feature = "tester"))]
+#[path = "tester/null.rs"]
+mod tester;
+
+use crate::tester::Tester;
+
use crate::core::border;
use crate::core::keyboard;
use crate::core::theme::{self, Base, Theme};
use crate::core::time::seconds;
use crate::core::window;
-use crate::core::{
- Alignment::Center, Color, Element, Font, Length::Fill, Size,
-};
+use crate::core::{Alignment::Center, Color, Element, Length::Fill};
use crate::futures::Subscription;
use crate::program::Program;
use crate::runtime::Task;
use crate::runtime::font;
-use crate::test::Emulator;
-use crate::test::emulator;
-use crate::test::instruction;
use crate::time_machine::TimeMachine;
use crate::widget::{
- Text, bottom_right, button, center, column, container, horizontal_space,
- opaque, row, scrollable, stack, text, text_input, themer,
+ bottom_right, button, center, column, container, horizontal_space,
+ monospace, opaque, row, scrollable, stack, text, themer,
};
use std::fmt;
@@ -127,49 +131,29 @@ where
P: Program,
{
state: P::State,
- size: Size,
- mode: Mode,
show_notification: bool,
time_machine: TimeMachine
,
+ mode: Mode
,
}
#[derive(Debug, Clone)]
pub enum Message {
HideNotification,
- Toggle,
ToggleComet,
CometLaunched(comet::launch::Result),
InstallComet,
Installing(comet::install::Result),
CancelSetup,
- ChangeWidth(String),
- ChangeHeight(String),
- Record,
- Stop,
- Recorded(core::Event),
- Play,
+ Toggle,
+ Tester(tester::Message),
}
enum Mode {
Hidden,
- Open { recorder: Recorder },
+ Open { tester: Tester
},
Setup(Setup),
}
-struct Recorder {
- instructions: Vec,
- state: State,
-}
-
-enum State {
- Idle,
- Recording,
- Playing {
- emulator: Emulator,
- current: usize,
- },
-}
-
enum Setup {
Idle { goal: Goal },
Running { logs: Vec },
@@ -188,7 +172,6 @@ where
(
Self {
state,
- size: Size::new(512.0, 512.0),
mode: Mode::Hidden,
show_notification: true,
time_machine: TimeMachine::new(),
@@ -217,18 +200,10 @@ where
match &self.mode {
Mode::Hidden => {
self.mode = Mode::Open {
- recorder: Recorder {
- instructions: Vec::new(),
- state: State::Idle,
- },
+ tester: Tester::new(),
};
}
- Mode::Open {
- recorder:
- Recorder {
- state: State::Idle, ..
- },
- } => {
+ Mode::Open { tester } if !tester.is_busy() => {
self.mode = Mode::Hidden;
}
Mode::Setup(_) | Mode::Open { .. } => {}
@@ -318,92 +293,12 @@ where
Task::none()
}
- Message::ChangeWidth(width) => {
- if let Ok(width) = width.parse() {
- self.size.width = width;
- }
-
- Task::none()
- }
- Message::ChangeHeight(height) => {
- if let Ok(height) = height.parse() {
- self.size.height = height;
- }
-
- Task::none()
- }
- Message::Record => {
- let Mode::Open { recorder } = &mut self.mode else {
+ Message::Tester(message) => {
+ let Mode::Open { tester } = &mut self.mode else {
return Task::none();
};
- recorder.instructions.clear();
- recorder.state = State::Recording;
-
- let (state, task) = program.boot();
- self.state = state;
-
- task.map(Event::Program)
- }
- Message::Recorded(event) => {
- let Mode::Open { recorder } = &mut self.mode else {
- return Task::none();
- };
-
- let Some(interaction) =
- instruction::Interaction::from_event(event)
- else {
- return Task::none();
- };
-
- if let Some(test::Instruction::Interact(last_interaction)) =
- recorder.instructions.pop()
- {
- let (last_interaction, new_interaction) =
- last_interaction.merge(interaction);
-
- recorder.instructions.push(
- test::Instruction::Interact(last_interaction),
- );
-
- if let Some(new_interaction) = new_interaction {
- recorder.instructions.push(
- test::Instruction::Interact(new_interaction),
- );
- }
- } else {
- recorder
- .instructions
- .push(test::Instruction::Interact(interaction));
- }
-
- Task::none()
- }
- Message::Stop => {
- let Mode::Open { recorder } = &mut self.mode else {
- return Task::none();
- };
-
- recorder.state = State::Idle;
-
- Task::none()
- }
- Message::Play => {
- let Mode::Open { recorder } = &mut self.mode else {
- return Task::none();
- };
-
- let (sender, receiver) =
- futures::futures::channel::mpsc::channel(1);
-
- let emulator = Emulator::new(program, self.size, sender);
-
- recorder.state = State::Playing {
- emulator,
- current: 0,
- };
-
- Task::run(receiver, Event::Emulator)
+ tester.update(program, message).map(Event::Tester)
}
},
Event::Program(message) => {
@@ -436,33 +331,12 @@ where
Task::none()
}
- Event::Emulator(event) => {
- let Mode::Open {
- recorder:
- Recorder {
- state: State::Playing { emulator, current },
- instructions,
- },
- } = &mut self.mode
- else {
+ Event::Tester(tick) => {
+ let Mode::Open { tester } = &mut self.mode else {
return Task::none();
};
- match event {
- emulator::Event::Action(action) => {
- emulator.perform(program, action);
- }
- emulator::Event::Ready => {
- if let Some(instruction) =
- instructions.get(*current).cloned()
- {
- emulator.run(program, instruction);
- *current += 1;
- }
- }
- }
-
- Task::none()
+ tester.tick(program, tick).map(Event::Tester)
}
Event::Discard => Task::none(),
}
@@ -476,25 +350,23 @@ where
let state = self.state();
let view = {
- let view = match &self.mode {
- Mode::Open {
- recorder:
- Recorder {
- state: State::Playing { emulator, .. },
- ..
- },
- } => emulator.view(program),
- _ => program.view(state, window),
+ let view = || {
+ let theme = program.theme(state, window);
+ let view: Element<'_, _, Theme, _> =
+ themer(theme, program.view(&self.state, window)).into();
+
+ if self.time_machine.is_rewinding() {
+ view.map(|_| Event::Discard)
+ } else {
+ view.map(Event::Program)
+ }
};
- let theme = program.theme(state, window);
-
- let view: Element<'_, _, Theme, _> = themer(theme, view).into();
-
- if self.time_machine.is_rewinding() {
- view.map(|_| Event::Discard)
- } else {
- view.map(Event::Program)
+ match &self.mode {
+ Mode::Open { tester } => {
+ tester.view(program, window, view, Event::Tester)
+ }
+ _ => view(),
}
};
@@ -536,104 +408,11 @@ where
))
});
- let sidebar = if let Mode::Open { recorder } = &self.mode {
+ let sidebar = if let Mode::Open { tester } = &self.mode {
let title = monospace("Developer Tools");
+ let tester = tester.controls().map(Message::Tester);
- let recorder = {
- let events = container(if recorder.instructions.is_empty() {
- Element::from(center(
- monospace("No instructions recorded yet!")
- .size(14)
- .width(Fill)
- .center(),
- ))
- } else {
- scrollable(
- column(recorder.instructions.iter().enumerate().map(
- |(i, instruction)| {
- monospace(instruction.to_string())
- .size(10)
- .style(move |theme: &Theme| text::Style {
- color: match &recorder.state {
- State::Playing {
- current, ..
- } => {
- if *current == i {
- Some(
- theme.palette().primary,
- )
- } else if *current > i {
- Some(
- theme
- .extended_palette()
- .success
- .strong
- .color,
- )
- } else {
- None
- }
- }
- _ => None,
- },
- })
- .into()
- },
- ))
- .spacing(5),
- )
- .spacing(5)
- .into()
- })
- .width(Fill)
- .height(Fill)
- .padding(5);
-
- let controls = {
- row![
- button(icon::play().size(14).width(Fill).center())
- .on_press_maybe(
- (!matches!(recorder.state, State::Recording)
- && !recorder.instructions.is_empty())
- .then_some(Message::Play),
- ),
- if let State::Recording = &recorder.state {
- button(icon::stop().size(14).width(Fill).center())
- .on_press(Message::Stop)
- .style(button::success)
- } else {
- button(icon::record().size(14).width(Fill).center())
- .on_press_maybe(
- matches!(recorder.state, State::Idle)
- .then_some(Message::Record),
- )
- .style(button::danger)
- }
- ]
- .spacing(10)
- };
-
- column![events, controls].spacing(10).align_x(Center)
- };
-
- let viewport = row![
- text_input("Width", &self.size.width.to_string())
- .size(14)
- .on_input(Message::ChangeWidth),
- monospace("x"),
- text_input("Height", &self.size.height.to_string())
- .size(14)
- .on_input(Message::ChangeHeight),
- ]
- .spacing(10)
- .align_y(Center);
-
- let tools = column![
- title,
- labeled("Viewport", viewport),
- labeled("Tester", recorder)
- ]
- .spacing(10);
+ let tools = column![title, tester].spacing(10);
let sidebar = container(tools)
.padding(10)
@@ -646,65 +425,7 @@ where
None
};
- let content = row![if let Mode::Open { recorder } = &self.mode {
- let status = match &recorder.state {
- State::Idle => monospace("Idle").style(|theme| text::Style {
- color: Some(
- theme.extended_palette().background.strongest.color,
- ),
- }),
- State::Recording => {
- monospace("Recording").style(|theme| text::Style {
- color: Some(theme.palette().danger),
- })
- }
- State::Playing { .. } => {
- monospace("Playing").style(|theme| text::Style {
- color: Some(theme.palette().primary),
- })
- }
- };
-
- let viewport = container(
- scrollable(
- container(if let State::Recording = &recorder.state {
- widget::recorder(view)
- .on_event(|event| {
- Event::Message(Message::Recorded(event))
- })
- .into()
- } else {
- view
- })
- .width(self.size.width)
- .height(self.size.height),
- )
- .direction(scrollable::Direction::Both {
- vertical: scrollable::Scrollbar::default(),
- horizontal: scrollable::Scrollbar::default(),
- }),
- )
- .style(|theme| {
- let palette = theme.extended_palette();
-
- container::Style {
- border: border::width(2.0).color(match &recorder.state {
- State::Idle => palette.background.strongest.color,
- State::Recording => palette.danger.base.color,
- State::Playing { .. } => palette.primary.base.color,
- }),
- ..container::Style::default()
- }
- })
- .padding(10);
-
- center(column![status, viewport].spacing(10).align_x(Right))
- .padding(10)
- .into()
- } else {
- view
- }]
- .push_maybe(sidebar);
+ let content = row![view].push_maybe(sidebar);
themer(
theme,
@@ -724,8 +445,13 @@ where
let hotkeys =
futures::keyboard::on_key_press(|key, _modifiers| match key {
keyboard::Key::Named(keyboard::key::Named::F12) => {
- Some(Message::Toggle)
+ Some(if cfg!(feature = "tester") {
+ Message::Toggle
+ } else {
+ Message::ToggleComet
+ })
}
+ #[cfg(feature = "tester")]
keyboard::Key::Named(keyboard::key::Named::F11) => {
Some(Message::ToggleComet)
}
@@ -761,7 +487,7 @@ where
{
Message(Message),
Program(P::Message),
- Emulator(emulator::Event),
+ Tester(tester::Tick
),
Command(debug::Command),
Discard,
}
@@ -774,7 +500,7 @@ where
match self {
Self::Message(message) => message.fmt(f),
Self::Program(message) => message.fmt(f),
- Self::Emulator(_) => f.write_str("Emulator"),
+ Self::Tester(_) => f.write_str("Tester"),
Self::Command(command) => command.fmt(f),
Self::Discard => f.write_str("Discard"),
}
@@ -791,7 +517,7 @@ where
Self::Message(message) => Self::Message(message.clone()),
Self::Program(message) => Self::Program(message.clone()),
Self::Command(command) => Self::Command(*command),
- Self::Emulator(_) => Self::Discard, // Time traveling an emulator?!
+ Self::Tester(_) => Self::Discard, // Time traveling an emulator?!
Self::Discard => Self::Discard,
}
}
@@ -926,25 +652,3 @@ where
.padding([2, 4])
.into()
}
-
-fn monospace<'a, Renderer>(
- fragment: impl text::IntoFragment<'a>,
-) -> Text<'a, Theme, Renderer>
-where
- Renderer: program::Renderer + 'a,
-{
- text(fragment).font(Font::MONOSPACE)
-}
-
-fn labeled<'a, Message, Renderer>(
- fragment: impl text::IntoFragment<'a>,
- content: impl Into>,
-) -> Element<'a, Message, Theme, Renderer>
-where
- Message: 'a,
- Renderer: program::Renderer + 'a,
-{
- column![monospace(fragment).size(14), content.into()]
- .spacing(5)
- .into()
-}
diff --git a/devtools/src/tester.rs b/devtools/src/tester.rs
new file mode 100644
index 00000000..73a7793a
--- /dev/null
+++ b/devtools/src/tester.rs
@@ -0,0 +1,346 @@
+mod recorder;
+
+use recorder::recorder;
+
+use crate::Program;
+use crate::core::Alignment::Center;
+use crate::core::Length::Fill;
+use crate::core::alignment::Horizontal::Right;
+use crate::core::border;
+use crate::core::window;
+use crate::core::{Element, Event, Size, Theme};
+use crate::futures::futures::channel::mpsc;
+use crate::icon;
+use crate::program;
+use crate::runtime::Task;
+use crate::test::emulator;
+use crate::test::instruction;
+use crate::test::{Emulator, Instruction};
+use crate::widget::{
+ button, center, column, container, monospace, row, scrollable, text,
+ text_input, themer,
+};
+
+pub struct Tester {
+ viewport: Size,
+ instructions: Vec,
+ state: State,
+}
+
+enum State {
+ Idle,
+ Recording {
+ state: P::State,
+ },
+ Playing {
+ emulator: Emulator,
+ current: usize,
+ },
+}
+
+#[derive(Debug, Clone)]
+pub enum Message {
+ ChangeViewport(Size),
+ Record,
+ Stop,
+ Play,
+}
+
+#[allow(missing_debug_implementations)]
+pub enum Tick {
+ Program(P::Message),
+ Recorder(Event),
+ Emulator(emulator::Event),
+}
+
+impl Tester {
+ pub fn new() -> Self {
+ Self {
+ viewport: Size::new(512.0, 512.0),
+ instructions: Vec::new(),
+ state: State::Idle,
+ }
+ }
+
+ pub fn is_busy(&self) -> bool {
+ matches!(self.state, State::Idle | State::Playing { .. })
+ }
+
+ pub fn update(&mut self, program: &P, message: Message) -> Task> {
+ match message {
+ Message::ChangeViewport(viewport) => {
+ self.viewport = viewport;
+
+ Task::none()
+ }
+ Message::Record => {
+ self.instructions.clear();
+
+ let (state, task) = program.boot();
+ self.state = State::Recording { state };
+
+ task.map(Tick::Program)
+ }
+ Message::Stop => {
+ self.state = State::Idle;
+
+ Task::none()
+ }
+ Message::Play => {
+ let (sender, receiver) = mpsc::channel(1);
+ let emulator = Emulator::new(program, self.viewport, sender);
+
+ self.state = State::Playing {
+ emulator,
+ current: 0,
+ };
+
+ Task::run(receiver, Tick::Emulator)
+ }
+ }
+ }
+
+ pub fn tick(&mut self, program: &P, tick: Tick) -> Task> {
+ match tick {
+ Tick::Program(message) => {
+ let State::Recording { state } = &mut self.state else {
+ return Task::none();
+ };
+
+ program.update(state, message).map(Tick::Program)
+ }
+ Tick::Recorder(event) => {
+ let Some(interaction) =
+ instruction::Interaction::from_event(event)
+ else {
+ return Task::none();
+ };
+
+ if let Some(Instruction::Interact(last_interaction)) =
+ self.instructions.pop()
+ {
+ let (last_interaction, new_interaction) =
+ last_interaction.merge(interaction);
+
+ self.instructions
+ .push(Instruction::Interact(last_interaction));
+
+ if let Some(new_interaction) = new_interaction {
+ self.instructions
+ .push(Instruction::Interact(new_interaction));
+ }
+ } else {
+ self.instructions.push(Instruction::Interact(interaction));
+ }
+
+ Task::none()
+ }
+ Tick::Emulator(event) => {
+ let State::Playing { emulator, current } = &mut self.state
+ else {
+ return Task::none();
+ };
+
+ match event {
+ emulator::Event::Action(action) => {
+ emulator.perform(program, action);
+ }
+ emulator::Event::Ready => {
+ if let Some(instruction) =
+ self.instructions.get(*current).cloned()
+ {
+ emulator.run(program, instruction);
+ *current += 1;
+ }
+ }
+ }
+
+ Task::none()
+ }
+ }
+ }
+
+ pub fn view<'a, T: 'static>(
+ &'a self,
+ program: &P,
+ window: window::Id,
+ current: impl FnOnce() -> Element<'a, T, Theme, P::Renderer>,
+ emulate: impl Fn(Tick) -> T + 'a,
+ ) -> Element<'a, T, Theme, P::Renderer> {
+ let status = match &self.state {
+ State::Idle => monospace("Idle").style(|theme| text::Style {
+ color: Some(
+ theme.extended_palette().background.strongest.color,
+ ),
+ }),
+ State::Recording { .. } => {
+ monospace("Recording").style(|theme| text::Style {
+ color: Some(theme.palette().danger),
+ })
+ }
+ State::Playing { .. } => {
+ monospace("Playing").style(|theme| text::Style {
+ color: Some(theme.palette().primary),
+ })
+ }
+ };
+
+ let viewport = container(
+ scrollable(
+ container(match &self.state {
+ State::Idle => current(),
+ State::Recording { state } => {
+ let theme = program.theme(state, window);
+ let view =
+ program.view(state, window).map(Tick::Program);
+
+ Element::from(
+ recorder(themer(theme, view))
+ .on_event(Tick::Recorder),
+ )
+ .map(emulate)
+ }
+ State::Playing { emulator, .. } => {
+ let theme = emulator.theme(program);
+ let view = emulator.view(program).map(Tick::Program);
+
+ Element::from(themer(theme, view)).map(emulate)
+ }
+ })
+ .width(self.viewport.width)
+ .height(self.viewport.height),
+ )
+ .direction(scrollable::Direction::Both {
+ vertical: scrollable::Scrollbar::default(),
+ horizontal: scrollable::Scrollbar::default(),
+ }),
+ )
+ .style(|theme: &Theme| {
+ let palette = theme.extended_palette();
+
+ container::Style {
+ border: border::width(2.0).color(match &self.state {
+ State::Idle => palette.background.strongest.color,
+ State::Recording { .. } => palette.danger.base.color,
+ State::Playing { .. } => palette.primary.base.color,
+ }),
+ ..container::Style::default()
+ }
+ })
+ .padding(10);
+
+ center(column![status, viewport].spacing(10).align_x(Right))
+ .padding(10)
+ .into()
+ }
+
+ pub fn controls(&self) -> Element<'_, Message, Theme, P::Renderer> {
+ let viewport = row![
+ text_input("Width", &self.viewport.width.to_string())
+ .size(14)
+ .on_input(|width| Message::ChangeViewport(Size {
+ width: width.parse().unwrap_or(self.viewport.width),
+ ..self.viewport
+ })),
+ monospace("x"),
+ text_input("Height", &self.viewport.height.to_string())
+ .size(14)
+ .on_input(|height| Message::ChangeViewport(Size {
+ height: height.parse().unwrap_or(self.viewport.height),
+ ..self.viewport
+ })),
+ ]
+ .spacing(10)
+ .align_y(Center);
+
+ let player = {
+ let events = container(if self.instructions.is_empty() {
+ Element::from(center(
+ monospace("No instructions recorded yet!")
+ .size(14)
+ .width(Fill)
+ .center(),
+ ))
+ } else {
+ scrollable(
+ column(self.instructions.iter().enumerate().map(
+ |(i, instruction)| {
+ monospace(instruction.to_string())
+ .size(10)
+ .style(move |theme: &Theme| text::Style {
+ color: match &self.state {
+ State::Playing { current, .. } => {
+ if *current == i {
+ Some(theme.palette().primary)
+ } else if *current > i {
+ Some(
+ theme
+ .extended_palette()
+ .success
+ .strong
+ .color,
+ )
+ } else {
+ None
+ }
+ }
+ _ => None,
+ },
+ })
+ .into()
+ },
+ ))
+ .spacing(5),
+ )
+ .spacing(5)
+ .into()
+ })
+ .width(Fill)
+ .height(Fill)
+ .padding(5);
+
+ let controls = {
+ row![
+ button(icon::play().size(14).width(Fill).center())
+ .on_press_maybe(
+ (!matches!(self.state, State::Recording { .. })
+ && !self.instructions.is_empty())
+ .then_some(Message::Play),
+ ),
+ if let State::Recording { .. } = &self.state {
+ button(icon::stop().size(14).width(Fill).center())
+ .on_press(Message::Stop)
+ .style(button::success)
+ } else {
+ button(icon::record().size(14).width(Fill).center())
+ .on_press_maybe(
+ matches!(self.state, State::Idle)
+ .then_some(Message::Record),
+ )
+ .style(button::danger)
+ }
+ ]
+ .spacing(10)
+ };
+
+ column![events, controls].spacing(10).align_x(Center)
+ };
+
+ column![labeled("Viewport", viewport), labeled("Tester", player)]
+ .spacing(10)
+ .into()
+ }
+}
+
+fn labeled<'a, Message, Renderer>(
+ fragment: impl text::IntoFragment<'a>,
+ content: impl Into>,
+) -> Element<'a, Message, Theme, Renderer>
+where
+ Message: 'a,
+ Renderer: program::Renderer + 'a,
+{
+ column![monospace(fragment).size(14), content.into()]
+ .spacing(5)
+ .into()
+}
diff --git a/devtools/src/tester/null.rs b/devtools/src/tester/null.rs
new file mode 100644
index 00000000..3a7247ba
--- /dev/null
+++ b/devtools/src/tester/null.rs
@@ -0,0 +1,51 @@
+use crate::Program;
+use crate::core::window;
+use crate::core::{Element, Theme};
+use crate::runtime::Task;
+use crate::widget::horizontal_space;
+
+use std::marker::PhantomData;
+
+pub struct Tester {
+ _type: PhantomData,
+}
+
+#[derive(Debug, Clone)]
+pub enum Message {}
+
+#[allow(missing_debug_implementations)]
+pub struct Tick {
+ _type: PhantomData,
+}
+
+impl Tester {
+ pub fn new() -> Self {
+ Self { _type: PhantomData }
+ }
+
+ pub fn is_busy(&self) -> bool {
+ false
+ }
+
+ pub fn update(&mut self, _program: &P, _message: Message) -> Task> {
+ Task::none()
+ }
+
+ pub fn tick(&mut self, _program: &P, _tick: Tick) -> Task> {
+ Task::none()
+ }
+
+ pub fn view<'a, T: 'static>(
+ &'a self,
+ _program: &P,
+ _window: window::Id,
+ _current: impl FnOnce() -> Element<'a, T, Theme, P::Renderer>,
+ _emulate: impl Fn(Tick) -> T + 'a,
+ ) -> Element<'a, T, Theme, P::Renderer> {
+ horizontal_space().into()
+ }
+
+ pub fn controls(&self) -> Element<'_, Message, Theme, P::Renderer> {
+ horizontal_space().into()
+ }
+}
diff --git a/devtools/src/widget/recorder.rs b/devtools/src/tester/recorder.rs
similarity index 96%
rename from devtools/src/widget/recorder.rs
rename to devtools/src/tester/recorder.rs
index bae43478..47191582 100644
--- a/devtools/src/widget/recorder.rs
+++ b/devtools/src/tester/recorder.rs
@@ -8,6 +8,12 @@ use crate::core::{
Size, Widget,
};
+pub fn recorder<'a, Message, Theme, Renderer>(
+ content: impl Into>,
+) -> Recorder<'a, Message, Theme, Renderer> {
+ Recorder::new(content)
+}
+
#[allow(missing_debug_implementations)]
pub struct Recorder<'a, Message, Theme, Renderer> {
content: Element<'a, Message, Theme, Renderer>,
diff --git a/devtools/src/time_machine.rs b/devtools/src/time_machine.rs
index 6d8b80ae..f999c70e 100644
--- a/devtools/src/time_machine.rs
+++ b/devtools/src/time_machine.rs
@@ -30,6 +30,7 @@ where
}
pub fn rewind(&mut self, program: &P, message: usize) {
+ crate::debug::disable();
let (mut state, _) = program.boot();
if message < self.messages.len() {
@@ -40,7 +41,6 @@ where
}
self.state = Some(state);
- crate::debug::disable();
}
pub fn go_to_present(&mut self) {
diff --git a/devtools/src/widget.rs b/devtools/src/widget.rs
index 3067a1ca..ef247508 100644
--- a/devtools/src/widget.rs
+++ b/devtools/src/widget.rs
@@ -1,12 +1,13 @@
-mod recorder;
-
pub use iced_widget::*;
-pub use recorder::Recorder;
-use crate::core::Element;
+use crate::core::Font;
+use crate::program;
-pub fn recorder<'a, Message, Theme, Renderer>(
- content: impl Into>,
-) -> Recorder<'a, Message, Theme, Renderer> {
- Recorder::new(content)
+pub fn monospace<'a, Renderer>(
+ fragment: impl text::IntoFragment<'a>,
+) -> Text<'a, Theme, Renderer>
+where
+ Renderer: program::Renderer + 'a,
+{
+ text(fragment).font(Font::MONOSPACE)
}
diff --git a/examples/todos/Cargo.toml b/examples/todos/Cargo.toml
index 5e16a2ac..de23558e 100644
--- a/examples/todos/Cargo.toml
+++ b/examples/todos/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
[dependencies]
iced.workspace = true
-iced.features = ["tokio", "debug", "time-travel"]
+iced.features = ["tokio", "time-travel", "tester"]
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
diff --git a/test/src/emulator.rs b/test/src/emulator.rs
index c76301b5..e0170c1d 100644
--- a/test/src/emulator.rs
+++ b/test/src/emulator.rs
@@ -158,6 +158,10 @@ impl Emulator {
) -> Element<'_, P::Message, P::Theme, P::Renderer> {
program.view(&self.state, self.window)
}
+
+ pub fn theme(&self, program: &P) -> P::Theme {
+ program.theme(&self.state, self.window)
+ }
}
struct Clipboard {