From 4731cf3bc6f0c757039029d6a8c0419f9d901f64 Mon Sep 17 00:00:00 2001 From: tosti007 Date: Fri, 10 May 2024 13:39:51 +0200 Subject: [PATCH 1/2] Disable drag_to_scroll on frame selection ScrollArea --- puffin_egui/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/puffin_egui/src/lib.rs b/puffin_egui/src/lib.rs index 54229d6e..e552be82 100644 --- a/puffin_egui/src/lib.rs +++ b/puffin_egui/src/lib.rs @@ -565,6 +565,7 @@ impl ProfilerUi { Frame::dark_canvas(ui.style()).show(ui, |ui| { egui::ScrollArea::horizontal() .stick_to_right(true) + .drag_to_scroll(false) .show(ui, |ui| { let slowest_visible = self.show_frame_list( ui, From c8fc7e8ad2bfd92ff44e4d768be97d5f3af7117f Mon Sep 17 00:00:00 2001 From: tosti007 Date: Fri, 10 May 2024 13:47:07 +0200 Subject: [PATCH 2/2] Update CHANGELOG --- puffin_egui/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/puffin_egui/CHANGELOG.md b/puffin_egui/CHANGELOG.md index 0113b0ed..efa4039e 100644 --- a/puffin_egui/CHANGELOG.md +++ b/puffin_egui/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to the egui crate will be documented in this file. ## [Unreleased] - ReleaseDate +- [PR#207](https://github.com/EmbarkStudios/puffin/pull/207) Fixed frame selection input handling + ## [0.27.0] - 2024-04-06 - [PR#201](https://github.com/EmbarkStudios/puffin/pull/201) Update to egui `0.27`