Upgrade to egui 0.31

EmbarkStudios · Feb 6, 2025 · 993b78a · 993b78a
1 parent 3be326c
commit 993b78a
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/puffin_egui/Cargo.toml b/puffin_egui/Cargo.toml
@@ -22,8 +22,8 @@ include = [
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-egui = { version = "0.30.0", default-features = false }
-egui_extras = { version = "0.30.0", default-features = false, features = ["serde"] }
+egui = { version = "0.31.0", default-features = false }
+egui_extras = { version = "0.31.0", default-features = false, features = ["serde"] }
 indexmap = { version = "2.1.0", features = ["serde"] }
 natord = "1.0.9"
 once_cell = "1.7"
@@ -38,7 +38,7 @@ vec1 = "1.8"
 web-time = "0.2"
 
 [dev-dependencies]
-eframe = { version = "0.30.0", default-features = false, features = [
+eframe = { version = "0.31.0", default-features = false, features = [
   "default_fonts",
   "glow",
   "persistence",

diff --git a/puffin_egui/src/flamegraph.rs b/puffin_egui/src/flamegraph.rs
@@ -2,7 +2,7 @@ use std::vec;
 
 use super::{SelectedFrames, ERROR_COLOR, HOVER_COLOR};
 use crate::filter::Filter;
-use egui::*;
+use egui::{emath::GuiRounding, *};
 use indexmap::IndexMap;
 use puffin::*;
 
@@ -723,7 +723,7 @@ fn paint_record(
             start_x + 4.0,
             top_y + 0.5 * (options.rect_height - info.text_height),
         );
-        let pos = painter.round_pos_to_pixels(pos);
+        let pos = pos.round_to_pixels(painter.pixels_per_point());
         const TEXT_COLOR: Color32 = Color32::BLACK;
         painter.text(
             pos,

diff --git a/puffin_viewer/Cargo.toml b/puffin_viewer/Cargo.toml
@@ -29,7 +29,7 @@ puffin = { version = "0.19.1", path = "../puffin", features = [
 puffin_http = { version = "0.16.1", path = "../puffin_http" }
 
 argh = "0.1"
-eframe = { version = "0.30.0", default-features = false, features = [
+eframe = { version = "0.31.0", default-features = false, features = [
     "default_fonts",
     "glow",
     "persistence",