Initial support for egui 0.26. No hover/click on items.

StanfordLegion · Jun 11, 2024 · 80996aa · 80996aa
1 parent 0fada00
commit 80996aa
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,9 +20,9 @@ client = ["dep:reqwest", "dep:url"]
 server = ["dep:actix-cors", "dep:actix-web"]
 
 [dependencies]
-egui = "0.25.0"
-egui_extras = "0.25.0"
-eframe = { version = "0.25.0", default-features = false, features = [
+egui = "0.26.0"
+egui_extras = "0.26.0"
+eframe = { version = "0.26.0", default-features = false, features = [
     "accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
     "default_fonts", # Embed the default egui fonts.
     "glow",          # Use the glow rendering backend. Alternative: "wgpu".

diff --git a/src/app.rs b/src/app.rs
@@ -1740,7 +1740,9 @@ impl Window {
                 button_text.into_galley(ui, None, available_width, egui::TextStyle::Button);
             let button_size = button_text.size() + 2.0 * button_padding;
 
-            let query_size = ui.available_size().x - button_size.x - ui.spacing().item_spacing.x;
+            const MARGIN: f32 = 4.0; // From egui::TextEdit::margin
+            let query_size =
+                ui.available_size().x - button_size.x - ui.spacing().item_spacing.x - 2.0 * MARGIN;
             egui::TextEdit::singleline(&mut self.config.search_state.query)
                 .desired_width(query_size)
                 .show(ui);

diff --git a/src/main.rs b/src/main.rs
@@ -214,7 +214,7 @@ impl RandomDataSource {
     }
 
     fn entry_info(rng: &mut rand::rngs::ThreadRng) -> EntryInfo {
-        let kinds = vec![
+        let kinds = [
             "CPU".to_string(),
             "GPU".to_string(),
             "OMP".to_string(),