migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-03 15:20:05 -04:00
Code Activity

Merge branch 'main' into feat/harfrust-text-shaping

Browse Source 
# Conflicts:
#	crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x1.png
#	crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x2.png
#	crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x1.png
#	crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x2.png
This commit is contained in:
Emil Ernerfeldt
2026-03-29 10:02:11 +02:00
parent 73a1f01fb3 eb35f7d12f
commit 74b128451a
25 changed files with 98 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/egui_demo_app/Cargo.toml
View File

@@ -37,7 +37,7 @@ serde = ["dep:serde", "egui_demo_lib/serde", "egui/serde"]
syntect = ["egui_demo_lib/syntect"]
glow = ["eframe/glow"]
wgpu = ["eframe/wgpu", "bytemuck", "dep:wgpu"]
wgpu = ["eframe/wgpu", "bytemuck"]
wayland = ["eframe/wayland"]
x11 = ["eframe/x11"]
@@ -60,9 +60,6 @@ accesskit_consumer = { workspace = true, optional = true }
bytemuck = { workspace = true, optional = true }
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 }
# feature "http":

2
crates/egui_demo_app/src/backend_panel.rs
View File

@@ -211,7 +211,7 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
let wgpu_adapter_details_ui = |ui: &mut egui::Ui, adapter: &eframe::wgpu::Adapter| {
let info = &adapter.get_info();
let wgpu::AdapterInfo {
let eframe::wgpu::AdapterInfo {
name,
vendor,
device,