fix: egui 0.35.0 changes

2026-07-26 05:46:59 +00:00 · 2026-07-01 18:03:00 +03:00
parent 52dc0e3a09
commit dfb5985e4a
2 changed files with 27 additions and 137 deletions
@@ -929,15 +929,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"

-[[package]]
-name = "ecolor"
-version = "0.34.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a05fbfa222ffb51989d5ccf33e5f7aebfcf96c5023413856b0c3618a7f79896e"
-dependencies = [
- "emath 0.34.3",
-]
-
 [[package]]
 name = "ecolor"
 version = "0.35.0"
@@ -945,7 +936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6758be723a3f298bbfda4db75748bc2ba0abafe096b6383c7c32da264764fbc3"
 dependencies = [
 "bytemuck",
- "emath 0.35.0",
+ "emath",
 ]

 [[package]]
@@ -957,7 +948,7 @@ dependencies = [
 "ahash",
 "bytemuck",
 "document-features",
- "egui 0.35.0",
+ "egui",
 "egui-wgpu",
 "egui-winit",
 "egui_glow",
@@ -983,24 +974,6 @@ dependencies = [
 "winit",
 ]

-[[package]]
-name = "egui"
-version = "0.34.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42112be0ae157289312b92b3dfaf20e911b5a3c4c65d4aab0e7c47fbc0ce16e3"
-dependencies = [
- "accesskit",
- "ahash",
- "bitflags 2.13.0",
- "emath 0.34.3",
- "epaint 0.34.3",
- "log",
- "nohash-hasher",
- "profiling",
- "smallvec",
- "unicode-segmentation",
-]
-
 [[package]]
 name = "egui"
 version = "0.35.0"
@@ -1010,8 +983,8 @@ dependencies = [
 "accesskit",
 "ahash",
 "bitflags 2.13.0",
- "emath 0.35.0",
- "epaint 0.35.0",
+ "emath",
+ "epaint",
 "itertools 0.14.0",
 "log",
 "nohash-hasher",
@@ -1029,8 +1002,8 @@ dependencies = [
 "ahash",
 "bytemuck",
 "document-features",
- "egui 0.35.0",
- "epaint 0.35.0",
+ "egui",
+ "epaint",
 "log",
 "profiling",
 "thiserror 2.0.18",
@@ -1048,7 +1021,7 @@ checksum = "9ea6bf3608db949588b95b8b341ee358d0c3f95cf4dc3f53d8d76717edee87db"
 dependencies = [
 "arboard",
 "bytemuck",
- "egui 0.35.0",
+ "egui",
 "log",
 "objc2 0.6.4",
 "objc2-foundation 0.3.2",
@@ -1067,7 +1040,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4434e99040717912350c108ffe543ef68d34147691523fb726ae99adf0935b4"
 dependencies = [
- "egui 0.35.0",
+ "egui",
 "hello_egui_utils",
 "simple-easing",
 ]
@@ -1078,7 +1051,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1e40c74727cb2a7db02712604dbd293bb2a1dc8fa461e901612d280678fe56c"
 dependencies = [
- "egui 0.35.0",
+ "egui",
 "egui_animation",
 "simple-easing",
 "web-time",
@@ -1091,7 +1064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2bd33be7338367bf21f54d62e069d58a5fb3ae033fa8bc6df7a77b9ef4cf957"
 dependencies = [
 "ahash",
- "egui 0.35.0",
+ "egui",
 "enum-map",
 "itertools 0.14.0",
 "log",
@@ -1106,7 +1079,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52274b9bfb8d8e252cd0f00c9f6214f360d75a0962baa77a2d62ddb002fe99d4"
 dependencies = [
 "bytemuck",
- "egui 0.35.0",
+ "egui",
 "glow",
 "log",
 "memoffset",
@@ -1120,7 +1093,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd64a174529ad8ad5b3fcf74bafa368ed24aacc5887c2742b1e69ce4151c1a61"
 dependencies = [
- "egui 0.35.0",
+ "egui",
 ]

 [[package]]
@@ -1129,12 +1102,6 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"

-[[package]]
-name = "emath"
-version = "0.34.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b53f0d33a479321da6b0caa71366c9f67e8a2c149762d90bdc0d16e601ee8ecb"
-
 [[package]]
 name = "emath"
 version = "0.35.0"
@@ -1200,26 +1167,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "epaint"
-version = "0.34.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6675898a291ec212fc3df04f537d177fce8496120244590e6359dcaa4c25da79"
-dependencies = [
- "ahash",
- "ecolor 0.34.3",
- "emath 0.34.3",
- "font-types",
- "log",
- "nohash-hasher",
- "parking_lot",
- "profiling",
- "self_cell",
- "skrifa 0.40.0",
- "smallvec",
- "vello_cpu 0.0.6",
-]
-
 [[package]]
 name = "epaint"
 version = "0.35.0"
@@ -1228,8 +1175,8 @@ checksum = "4e60a8888b51da911df23918fd7301359b1d43a406a0ff3b8863af093dd7fc6c"
 dependencies = [
 "ahash",
 "bytemuck",
- "ecolor 0.35.0",
- "emath 0.35.0",
+ "ecolor",
+ "emath",
 "epaint_default_fonts",
 "font-types",
 "harfrust",
@@ -1239,11 +1186,11 @@ dependencies = [
 "profiling",
 "rayon",
 "self_cell",
- "skrifa 0.42.1",
+ "skrifa",
 "smallvec",
 "unicode-general-category",
 "unicode-segmentation",
- "vello_cpu 0.0.9",
+ "vello_cpu",
 ]

 [[package]]
@@ -1344,15 +1291,6 @@ dependencies = [
 "simd-adler32",
 ]

-[[package]]
-name = "fearless_simd"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb2907d1f08b2b316b9223ced5b0e89d87028ba8deae9764741dba8ff7f3903"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "fearless_simd"
 version = "0.4.1"
@@ -1595,9 +1533,9 @@ dependencies = [
 "hashbrown 0.17.1",
 "log",
 "peniko",
- "skrifa 0.42.1",
+ "skrifa",
 "smallvec",
- "vello_common 0.0.9",
+ "vello_common",
 ]

 [[package]]
@@ -1756,7 +1694,7 @@ checksum = "0431e8e389aa0f1e72bb9d1c2db8957a1a7a3580e8ed97db819c14837aac9b3e"
 dependencies = [
 "bitflags 2.13.0",
 "bytemuck",
- "read-fonts 0.39.2",
+ "read-fonts",
 "smallvec",
 ]

@@ -1791,7 +1729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e31f814d47d37c03981b24094192586560fbe490c0b4ae94e808bdf076610b6"
 dependencies = [
 "concat-idents",
- "egui 0.35.0",
+ "egui",
 ]

 [[package]]
@@ -3268,7 +3206,7 @@ version = "1.12.1"
 dependencies = [
 "anyhow",
 "eframe",
- "egui 0.35.0",
+ "egui",
 "egui_dnd",
 "egui_extras",
 "egui_material_icons",
@@ -3293,7 +3231,7 @@ dependencies = [
 "anyhow",
 "async-trait",
 "dirs",
- "egui 0.35.0",
+ "egui",
 "evdev",
 "itertools 0.15.0",
 "pipewire",
@@ -3479,16 +3417,6 @@ dependencies = [
 "crossbeam-utils",
 ]

-[[package]]
-name = "read-fonts"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5"
-dependencies = [
- "bytemuck",
- "font-types",
-]
-
 [[package]]
 name = "read-fonts"
 version = "0.39.2"
@@ -4055,16 +3983,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"

-[[package]]
-name = "skrifa"
-version = "0.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac"
-dependencies = [
- "bytemuck",
- "read-fonts 0.37.0",
-]
-
 [[package]]
 name = "skrifa"
 version = "0.42.1"
@@ -4072,7 +3990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564"
 dependencies = [
 "bytemuck",
- "read-fonts 0.39.2",
+ "read-fonts",
 ]

 [[package]]
@@ -4935,21 +4853,6 @@ dependencies = [
 "wasm-bindgen",
 ]

-[[package]]
-name = "vello_common"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bd1a4c633ce09e7d713df1a6e036644a125e15e0c169cfb5180ddf5836ca04b"
-dependencies = [
- "bytemuck",
- "fearless_simd 0.3.0",
- "hashbrown 0.16.1",
- "log",
- "peniko",
- "skrifa 0.40.0",
- "smallvec",
-]
-
 [[package]]
 name = "vello_common"
 version = "0.0.9"
@@ -4957,7 +4860,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d672facaa2d697285a786cd9d44d614cd2ce54cdc022504bf339f8fff3b750"
 dependencies = [
 "bytemuck",
- "fearless_simd 0.4.1",
+ "fearless_simd",
 "guillotiere",
 "hashbrown 0.17.1",
 "log",
@@ -4966,17 +4869,6 @@ dependencies = [
 "thiserror 2.0.18",
 ]

-[[package]]
-name = "vello_cpu"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162bfe48aabf6a9fdcd401b628c7d9f260c2cbabb343c70a65feba6f7849edc"
-dependencies = [
- "bytemuck",
- "hashbrown 0.16.1",
- "vello_common 0.0.6",
-]
-
 [[package]]
 name = "vello_cpu"
 version = "0.0.9"
@@ -4986,7 +4878,7 @@ dependencies = [
 "bytemuck",
 "glifo",
 "hashbrown 0.17.1",
- "vello_common 0.0.9",
+ "vello_common",
 ]

 [[package]]
@@ -3,7 +3,7 @@ mod update;
 mod views;

 use anyhow::{Result, anyhow};
-use eframe::{HardwareAcceleration, NativeOptions, icon_data::from_png_bytes, run_native};
+use eframe::{NativeOptions, icon_data::from_png_bytes, run_native};
 use egui::{Context, FontData, FontDefinitions, FontFamily, FontTweak, Vec2, ViewportBuilder};
 use itertools::Itertools;
 use pwsp_lib::{
@@ -219,7 +219,7 @@ impl SoundpadGui {
 fn add_font(font_name: &str, font_bytes: &[u8], fonts: &mut FontDefinitions) -> Result<()> {
    let font_data = FontData::from_owned(font_bytes.to_vec()).tweak(FontTweak {
        scale: 1.0,
-        hinting_override: Some(true),
+        hinting: Some(true),
        ..Default::default()
    });

@@ -265,9 +265,7 @@ pub async fn run() -> Result<()> {
    const ICON: &[u8] = include_bytes!("../../assets/icon.png");

    let options = NativeOptions {
-        vsync: true,
        centered: true,
-        hardware_acceleration: HardwareAcceleration::Preferred,

        viewport: ViewportBuilder::default()
            .with_app_id("ru.arabianq.pwsp")