Skip to content

Commit

Permalink
Revert update to egui 0.27 (EmbarkStudios#208)
Browse files Browse the repository at this point in the history
* Reverts EmbarkStudios#201
* Closes EmbarkStudios#205

The update to egui 0.27 broke scrolling and selection of scopes in the
flamegraph.

I'll revert it, and then we don't merge things without testing them next
time.
emilk authored May 17, 2024
1 parent 818fea5 commit 2d7d3c6
Showing 4 changed files with 22 additions and 30 deletions.
42 changes: 17 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions puffin_egui/Cargo.toml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ include = [
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
egui = { version = "0.27.1", default-features = false }
egui = { version = "0.26.1", default-features = false }
indexmap = { version = "2.1.0", features = ["serde"] }
natord = "1.0.9"
once_cell = "1.7"
@@ -36,7 +36,7 @@ vec1 = "1.8"
web-time = "0.2"

[dev-dependencies]
eframe = { version = "0.27.1", default-features = false, features = [
eframe = { version = "0.26.0", default-features = false, features = [
"default_fonts",
"glow",
] }
4 changes: 2 additions & 2 deletions puffin_egui/src/lib.rs
Original file line number Diff line number Diff line change
@@ -475,8 +475,8 @@ impl ProfilerUi {

ui.horizontal(|ui| {
let play_pause_button_size = Vec2::splat(24.0);
let space_pressed = ui.input(|i| i.key_pressed(egui::Key::Space))
&& ui.memory(|m| m.focused().is_none());
let space_pressed =
ui.input(|i| i.key_pressed(egui::Key::Space)) && ui.memory(|m| m.focus().is_none());

if self.paused.is_some() {
if ui
2 changes: 1 addition & 1 deletion puffin_viewer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ puffin = { version = "0.19.0", path = "../puffin", features = [
puffin_http = { version = "0.16.0", path = "../puffin_http" }

argh = "0.1"
eframe = { version = "0.27.1", default-features = false, features = [
eframe = { version = "0.26.0", default-features = false, features = [
"default_fonts",
"glow",
"persistence",

0 comments on commit 2d7d3c6

Please sign in to comment.