Skip to content
This repository was archived by the owner on Jun 5, 2024. It is now read-only.

Commit 520c67c

Browse files
committed
TMP 3
1 parent cf86d26 commit 520c67c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2080
-5509
lines changed

Cargo.lock

+821-1,839
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+3-48
Original file line numberDiff line numberDiff line change
@@ -20,56 +20,13 @@ default-target = "x86_64-pc-windows-msvc"
2020
features = ["im"]
2121
rustdoc-args = ["--cfg", "docsrs"]
2222

23-
[features]
24-
default = ["gtk", "image", "png", "jpeg"]
25-
gtk = ["druid-shell/gtk"]
26-
image = ["druid-shell/image"]
27-
serde_deps = ["im/serde", "druid-shell/serde"]
28-
svg = ["usvg"]
29-
x11 = ["druid-shell/x11"]
30-
31-
# passing on all the image features. AVIF is not supported because it does not
32-
# support decoding, and that's all we use `Image` for.
33-
bmp = ["druid-shell/bmp"]
34-
dds = ["druid-shell/dds"]
35-
dxt = ["druid-shell/dxt"]
36-
farbfeld = ["druid-shell/farbfeld"]
37-
gif = ["druid-shell/gif"]
38-
hdr = ["druid-shell/hdr"]
39-
ico = ["druid-shell/ico"]
40-
jpeg = ["druid-shell/jpeg"]
41-
jpeg_rayon = ["druid-shell/jpeg_rayon"]
42-
png = ["druid-shell/image_png"]
43-
pnm = ["druid-shell/pnm"]
44-
tga = ["druid-shell/tga"]
45-
tiff = ["druid-shell/tiff"]
46-
webp = ["druid-shell/webp"]
47-
48-
# Remember to update this when changing an image feature.
49-
image-all = ["image", "svg", "png", "jpeg", "jpeg_rayon", "gif", "bmp", "ico", "tiff", "webp", "pnm", "dds", "tga", "farbfeld", "dxt", "hdr"]
50-
23+
# NOTE: Make sure to keep wgpu version in sync with the version badge in README.md
5124
[dependencies]
52-
druid-shell = {version = "0.8.0", default-features = false}
53-
54-
# TODO - remove unused dependencies - See #10
55-
fluent-bundle = "0.15.1"
56-
fluent-langneg = "0.13.0"
57-
fluent-syntax = "0.11.0"
5825
fnv = "1.0.7"
5926
instant = {version = "0.1.6", features = ["wasm-bindgen"]}
6027
smallvec = "1.6.1"
6128
tracing = "0.1.29"
6229
tracing-subscriber = {version = "0.2.15", features = ["fmt", "ansi"], default-features = false}
63-
unic-langid = "0.9.0"
64-
unicode-segmentation = "1.6.0"
65-
xi-unicode = "0.3.0"
66-
67-
# Optional dependencies
68-
chrono = {version = "0.4.19", optional = true}
69-
im = {version = "15.0.0", optional = true}
70-
usvg = {version = "0.14.1", optional = true}
71-
72-
# TODO - make serde a dev dependency
7330
image = "0.24.0"
7431
once_cell = "1.9.0"
7532
serde = {version = "1.0.133", features = ["derive"]}
@@ -79,10 +36,9 @@ kurbo = "0.11.0"
7936
futures-intrusive = "0.5.0"
8037
pollster = "0.3.0"
8138
parley = { git = "https://github.com/dfrg/parley", rev = "4e6109f2ff5847a72dc77971b6fa0942b8474d88" }
82-
83-
# NOTE: Make sure to keep this in sync with the version badge in README.md
8439
wgpu = { version = "0.19.3" }
8540
swash = "0.1.15"
41+
winit = "0.29.15"
8642

8743
[target.'cfg(target_arch="wasm32")'.dependencies]
8844
console_error_panic_hook = {version = "0.1.6"}
@@ -91,10 +47,9 @@ tracing-wasm = {version = "0.2.0"}
9147
[dev-dependencies]
9248
float-cmp = {version = "0.8.0", features = ["std"], default-features = false}
9349
insta = {version = "1.8.0"}
94-
# tempfile 3.2.0 broke wasm; I assume it will be yanked (Jan 12, 2021)
9550
assert_matches = "1.5.0"
9651
pulldown-cmark = {version = "0.8", default-features = false}
97-
tempfile = "=3.1.0"
52+
tempfile = "3.10.1"
9853

9954
[target.'cfg(not(target_arch="wasm32"))'.dev-dependencies]
10055
open = "1.6"

src/action.rs

-6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
// details.
44

55
use std::any::Any;
6-
use std::collections::VecDeque;
76
use std::sync::Arc;
87

9-
use crate::{WidgetId, WindowId};
10-
118
// TODO - Refactor - See issue #1
129

1310
// TODO - TextCursor changed, ImeChanged, EnterKey, MouseEnter
@@ -51,6 +48,3 @@ impl std::fmt::Debug for Action {
5148
}
5249
}
5350
}
54-
55-
/// Our queue type
56-
pub(crate) type ActionQueue = VecDeque<(Action, WidgetId, WindowId)>;

src/app_launcher.rs

-96
This file was deleted.

0 commit comments

Comments
 (0)