skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into release-0.33.0 

# Conflicts:
#	.typos.toml
This commit is contained in:
lucasmerlin 2025-10-09 15:51:02 +02:00
parent eb200855f0 d50287b83c
commit 38b072919e
43 changed files with 192 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.vscode/settings.json vendored
View File

@ -12,32 +12,14 @@
"target_wasm/**": true,
"target/**": true,
},
// Tell Rust Analyzer to use its own target directory, so we don't need to wait for it to finish wen we want to `cargo run`
"rust-analyzer.check.overrideCommand": [
"cargo",
"clippy",
"--target-dir=target_ra",
"--workspace",
"--message-format=json",
"--all-targets",
"--all-features",
],
"rust-analyzer.cargo.buildScripts.overrideCommand": [
"cargo",
"clippy",
"--quiet",
"--target-dir=target_ra",
"--workspace",
"--message-format=json",
"--all-targets",
"--all-features",
],
"rust-analyzer.check.command": "clippy",
// Whether `--workspace` should be passed to `cargo clippy`. If false, `-p <package>` will be passed instead.
"rust-analyzer.check.workspace": false,
"rust-analyzer.cargo.allTargets": true,
"rust-analyzer.cargo.features": "all",
// Use a separate target directory for Rust Analyzer so it doesn't prevent cargo/clippy from doing things.
"rust-analyzer.cargo.targetDir": "target_ra",
"rust-analyzer.showUnlinkedFileNotification": false,
"rust-analyzer.cargo.extraEnv": {
// rust-analyzer is only guaranteed to support the latest stable version of Rust. Use it instead of whatever is
// specified in rust-toolchain.
"RUSTUP_TOOLCHAIN": "stable"
},
// Uncomment the following options and restart rust-analyzer to get it to check code behind `cfg(target_arch=wasm32)`.
// Don't forget to put it in a comment again before committing.
// "rust-analyzer.cargo.target": "wasm32-unknown-unknown",

2
Cargo.toml
View File

@ -77,7 +77,7 @@ ahash = { version = "0.8.12", default-features = false, features = [
"std",
] }
android_logger = "0.15.1"
arboard = { version = "3.6.1", default-features = false}
arboard = { version = "3.6.1", default-features = false }
backtrace = "0.3.76"
bitflags = "2.9.4"
bytemuck = "1.24.0"

5
crates/ecolor/Cargo.toml
View File

@ -1,10 +1,7 @@
[package]
name = "ecolor"
version.workspace = true
authors = [
"Emil Ernerfeldt <emil.ernerfeldt@gmail.com>",
"Andreas Reich <reichandreas@gmx.de>",
]
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>", "Andreas Reich <reichandreas@gmx.de>"]
description = "Color structs and color conversion utilities"
edition.workspace = true
rust-version.workspace = true

31
crates/eframe/Cargo.toml
View File

@ -11,13 +11,7 @@ readme = "README.md"
repository = "https://github.com/emilk/egui/tree/main/crates/eframe"
categories = ["gui", "game-development"]
keywords = ["egui", "gui", "gamedev"]
include = [
"../LICENSE-APACHE",
"../LICENSE-MIT",
"**/*.rs",
"Cargo.toml",
"data/icon.png",
]
include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml", "data/icon.png"]
[package.metadata.docs.rs]
all-features = true
@ -66,13 +60,7 @@ default_fonts = ["egui/default_fonts"]
glow = ["dep:egui_glow", "dep:glow", "dep:glutin-winit", "dep:glutin"]
## Enable saving app state to disk.
persistence = [
"dep:home",
"egui-winit/serde",
"egui/persistence",
"ron",
"serde",
]
persistence = ["dep:home", "egui-winit/serde", "egui/persistence", "ron", "serde"]
## Enables wayland support and fixes clipboard issue.
##
@ -88,10 +76,7 @@ wayland = [
## Enable screen reader support (requires `ctx.options_mut(|o| o.screen_reader = true);`) on web.
##
## For other platforms, use the `accesskit` feature instead.
web_screen_reader = [
"web-sys/SpeechSynthesis",
"web-sys/SpeechSynthesisUtterance",
]
web_screen_reader = ["web-sys/SpeechSynthesis", "web-sys/SpeechSynthesisUtterance"]
## Use [`wgpu`](https://docs.rs/wgpu) for painting (via [`egui-wgpu`](https://github.com/emilk/egui/tree/main/crates/egui-wgpu)).
##
@ -145,10 +130,7 @@ serde = { workspace = true, optional = true }
# -------------------------------------------
# native:
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
egui-winit = { workspace = true, default-features = false, features = [
"clipboard",
"links",
] }
egui-winit = { workspace = true, default-features = false, features = ["clipboard", "links"] }
image = { workspace = true, features = ["png"] } # Needed for app icon
winit = { workspace = true, default-features = false, features = ["rwh_06"] }
@ -158,10 +140,7 @@ egui-wgpu = { workspace = true, optional = true, features = [
] } # if wgpu is used, use it with winit
pollster = { workspace = true, optional = true } # needed for wgpu
glutin = { workspace = true, optional = true, default-features = false, features = [
"egl",
"wgl",
] }
glutin = { workspace = true, optional = true, default-features = false, features = ["egl", "wgl"] }
glutin-winit = { workspace = true, optional = true, default-features = false, features = [
"egl",
"wgl",

8
crates/egui-wgpu/Cargo.toml
View File

@ -15,13 +15,7 @@ readme = "README.md"
repository = "https://github.com/emilk/egui/tree/main/crates/egui-wgpu"
categories = ["gui", "game-development"]
keywords = ["wgpu", "egui", "gui", "gamedev"]
include = [
"../LICENSE-APACHE",
"../LICENSE-MIT",
"**/*.rs",
"**/*.wgsl",
"Cargo.toml",
]
include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "**/*.wgsl", "Cargo.toml"]
[lints]
workspace = true

4
crates/egui-winit/Cargo.toml
View File

@ -100,6 +100,4 @@ smithay-clipboard = { workspace = true, optional = true }
wayland-cursor = { workspace = true, optional = true }
[target.'cfg(not(target_os = "android"))'.dependencies]
arboard = { workspace = true, optional = true, features = [
"image-data",
] }
arboard = { workspace = true, optional = true, features = ["image-data"] }

17
crates/egui_demo_app/Cargo.toml
View File

@ -31,12 +31,7 @@ web_app = ["http", "persistence"]
accessibility_inspector = ["dep:accesskit", "dep:accesskit_consumer", "eframe/accesskit"]
http = ["ehttp", "image/jpeg", "poll-promise", "egui_extras/image"]
image_viewer = ["image/jpeg", "egui_extras/all_loaders", "rfd"]
persistence = [
"eframe/persistence",
"egui_extras/serde",
"egui/persistence",
"serde",
]
persistence = ["eframe/persistence", "egui_extras/serde", "egui/persistence", "serde"]
puffin = ["dep:puffin", "dep:puffin_http", "profiling/profile-with-puffin"]
serde = ["dep:serde", "egui_demo_lib/serde", "egui/serde"]
syntect = ["egui_demo_lib/syntect"]
@ -48,9 +43,7 @@ x11 = ["eframe/x11"]
[dependencies]
chrono = { workspace = true, features = ["js-sys", "wasmbind"] }
eframe = { workspace = true, default-features = false, features = [
"web_screen_reader",
] }
eframe = { workspace = true, default-features = false, features = ["web_screen_reader"] }
egui = { workspace = true, features = ["callstack", "default"] }
egui_demo_lib = { workspace = true, features = ["default", "chrono"] }
egui_extras = { workspace = true, features = ["default", "image"] }
@ -69,11 +62,7 @@ puffin = { workspace = true, optional = true }
puffin_http = { workspace = true, optional = true }
# Enable both WebGL & WebGPU when targeting the web (these features have no effect when not targeting wasm32)
# Also enable the default features so we have a supported backend for every platform.
wgpu = { workspace = true, features = [
"default",
"webgpu",
"webgl",
], optional = true }
wgpu = { workspace = true, features = ["default", "webgpu", "webgl"], optional = true }
# feature "http":

8
crates/egui_demo_lib/Cargo.toml
View File

@ -11,13 +11,7 @@ readme = "README.md"
repository = "https://github.com/emilk/egui/tree/main/crates/egui_demo_lib"
categories = ["gui", "graphics"]
keywords = ["glow", "egui", "gui", "gamedev"]
include = [
"../LICENSE-APACHE",
"../LICENSE-MIT",
"**/*.rs",
"Cargo.toml",
"data/*",
]
include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml", "data/*"]
[lints]
workspace = true

7
crates/egui_extras/Cargo.toml
View File

@ -83,12 +83,7 @@ profiling.workspace = true
serde = { workspace = true, optional = true }
# Date operations needed for datepicker widget
chrono = { workspace = true, optional = true, features = [
"clock",
"js-sys",
"std",
"wasmbind",
] }
chrono = { workspace = true, optional = true, features = ["clock", "js-sys", "std", "wasmbind"] }
## Enable this when generating docs.
document-features = { workspace = true, optional = true }

8
crates/egui_glow/Cargo.toml
View File

@ -11,13 +11,7 @@ readme = "README.md"
repository = "https://github.com/emilk/egui/tree/main/crates/egui_glow"
categories = ["gui", "game-development"]
keywords = ["glow", "egui", "gui", "gamedev"]
include = [
"../LICENSE-APACHE",
"../LICENSE-MIT",
"**/*.rs",
"Cargo.toml",
"src/shader/*.glsl",
]
include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml", "src/shader/*.glsl"]
[lints]
workspace = true

20
crates/egui_kittest/Cargo.toml
View File

@ -1,10 +1,7 @@
[package]
name = "egui_kittest"
version.workspace = true
authors = [
"Lucas Meurer <lucasmeurer96@gmail.com>",
"Emil Ernerfeldt <emil.ernerfeldt@gmail.com>",
]
authors = ["Lucas Meurer <lucasmeurer96@gmail.com>", "Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
description = "Testing library for egui based on kittest and AccessKit"
edition.workspace = true
rust-version.workspace = true
@ -24,13 +21,7 @@ rustdoc-args = ["--generate-link-to-definition"]
[features]
## Adds a wgpu-based test renderer.
wgpu = [
"dep:egui-wgpu",
"dep:pollster",
"dep:image",
"dep:wgpu",
"eframe?/wgpu",
]
wgpu = ["dep:egui-wgpu", "dep:pollster", "dep:image", "dep:wgpu", "eframe?/wgpu"]
## Adds a dify-based image snapshot utility.
snapshot = ["dep:dify", "dep:image", "dep:open", "dep:tempfile", "image/png"]
@ -52,12 +43,7 @@ egui-wgpu = { workspace = true, optional = true }
pollster = { workspace = true, optional = true }
image = { workspace = true, optional = true }
# Enable DX12 because it always comes with a software rasterizer.
wgpu = { workspace = true, features = [
"metal",
"dx12",
"vulkan",
"gles",
], optional = true }
wgpu = { workspace = true, features = ["metal", "dx12", "vulkan", "gles"], optional = true }
# snapshot dependencies
dify = { workspace = true, optional = true }

9
crates/epaint/Cargo.toml
View File

@ -11,12 +11,7 @@ readme = "README.md"
repository = "https://github.com/emilk/egui/tree/main/crates/epaint"
categories = ["graphics", "gui"]
keywords = ["graphics", "gui", "egui"]
include = [
"../LICENSE-APACHE",
"../LICENSE-MIT",
"**/*.rs",
"Cargo.toml"
]
include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
[lints]
workspace = true
@ -71,7 +66,7 @@ ahash.workspace = true
log.workspace = true
nohash-hasher.workspace = true
parking_lot.workspace = true # Using parking_lot over std::sync::Mutex gives 50% speedups in some real-world scenarios.
profiling = { workspace = true}
profiling = { workspace = true }
#! ### Optional dependencies
bytemuck = { workspace = true, optional = true, features = ["derive"] }

5
examples/screenshot/Cargo.toml
View File

@ -1,10 +1,7 @@
[package]
name = "screenshot"
version = "0.1.0"
authors = [
"René Rössler <rene@freshx.de>",
"Andreas Faber <andreas.mfaber@gmail.com",
]
authors = ["René Rössler <rene@freshx.de>", "Andreas Faber <andreas.mfaber@gmail.com"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.88"

13
taplo.toml Normal file
View File

@ -0,0 +1,13 @@
# https://github.com/tamasfe/taplo
include = [
"*.toml",
"crates/**/*.toml",
"examples/**/*.toml",
"scripts/**/*.toml",
"tests/**/*.toml",
]
[formatting]
align_comments = false # causes unnecessary churn
column_width = 100

2
tests/egui_tests/Cargo.toml
View File

@ -8,7 +8,7 @@ version.workspace = true
[dev-dependencies]
egui = { workspace = true, default-features = true }
egui_kittest = { workspace = true, features = ["snapshot", "wgpu"] }
egui_extras = { workspace = true, features = ["image"]}
egui_extras = { workspace = true, features = ["image"] }
image = { workspace = true, features = ["png"] }
[lints]

5
tests/test_egui_extras_compilation/Cargo.toml
View File

@ -10,10 +10,7 @@ publish = false
workspace = true
[package.metadata.cargo-machete]
ignored = [
"eframe",
"egui_extras",
] # We don't use them, just check that things compile
ignored = ["eframe", "egui_extras"] # We don't use them, just check that things compile
[dependencies]
eframe = { workspace = true, features = ["default", "persistence"] }