Tweak spacing

puffin_egui/src/filter.rs

@@ -6,9 +6,11 @@ pub struct Filter {
 impl Filter {
     pub fn ui(&mut self, ui: &mut egui::Ui) {
         ui.horizontal(|ui| {
-            ui.label("Scope filter:");
-            ui.text_edit_singleline(&mut self.filter);
+            ui.spacing_mut().item_spacing.x = 4.0;
+
+            ui.add(egui::TextEdit::singleline(&mut self.filter).hint_text("Scope filter"));
             self.filter = self.filter.to_lowercase();
+
             if ui.button("ｘ").clicked() {
                 self.filter.clear();
             }

puffin_egui/src/flamegraph.rs

@@ -1,7 +1,7 @@
 use std::vec;
 
 use super::{SelectedFrames, ERROR_COLOR, HOVER_COLOR};
-use crate::{add_space, filter::Filter};
+use crate::filter::Filter;
 use egui::*;
 use indexmap::IndexMap;
 use puffin::*;
@@ -231,9 +231,9 @@ pub fn ui(
     ui.horizontal(|ui| {
         options.scope_name_filter.ui(ui);
 
-        add_space(ui);
-
         ui.menu_button("🔧 Settings", |ui| {
+            ui.set_max_height(500.0);
+
             {
                 let changed = ui
                     .checkbox(&mut options.merge_scopes, "Merge children with same ID")
@@ -260,23 +260,18 @@ pub fn ui(
 
             ui.group(|ui| {
                 ui.strong("Visible Threads");
-                egui::ScrollArea::vertical()
-                    .max_height(150.0)
-                    .id_source("f")
-                    .show(ui, |ui| {
-                        for f in frames.threads.keys() {
-                            let entry = options
-                                .flamegraph_threads
-                                .entry(f.name.clone())
-                                .or_default();
-                            ui.checkbox(&mut entry.flamegraph_show, f.name.clone());
-                        }
-                    });
+                egui::ScrollArea::vertical().id_source("f").show(ui, |ui| {
+                    for f in frames.threads.keys() {
+                        let entry = options
+                            .flamegraph_threads
+                            .entry(f.name.clone())
+                            .or_default();
+                        ui.checkbox(&mut entry.flamegraph_show, f.name.clone());
+                    }
+                });
             });
         });
 
-        add_space(ui);
-
         ui.menu_button("❓", |ui| {
             ui.label(
                 "Drag to pan.\n\
@@ -788,7 +783,7 @@ fn paint_scope(
                 Id::new("puffin_profiler_tooltip"),
                 |ui| {
                     paint_scope_details(ui, scope.id, scope.record.data, scope_details);
-                    add_space(ui);
+
                     ui.monospace(format!(
                         "duration: {:7.3} ms",
                         to_ms(scope.record.duration_ns)
@@ -911,8 +906,6 @@ fn merge_scope_tooltip(
 
     paint_scope_details(ui, merge.id, &merge.data, scope_details);
 
-    add_space(ui);
-
     if num_frames <= 1 {
         if merge.num_pieces <= 1 {
             ui.monospace(format!(

puffin_egui/src/lib.rs

@@ -444,13 +444,19 @@ impl ProfilerUi {
             return;
         };
 
+        ui.scope(|ui| {
+            ui.spacing_mut().item_spacing.y = 6.0;
+            self.ui_impl(ui, frame_view);
+        });
+    }
+
+    fn ui_impl(&mut self, ui: &mut egui::Ui, frame_view: &mut MaybeMutRef<'_, FrameView>) {
         let mut hovered_frame = None;
 
         egui::CollapsingHeader::new("Frame history")
             .default_open(false)
             .show(ui, |ui| {
                 hovered_frame = self.show_frames(ui, frame_view);
-                ui.add_space(4.0);
             });
 
         let frames = if let Some(frame) = hovered_frame {
@@ -519,7 +525,7 @@ impl ProfilerUi {
                     }
                 });
             }
-            add_space(ui);
+
             frames_info_ui(ui, &frames);
         });
 
@@ -541,16 +547,12 @@ impl ProfilerUi {
             ui.ctx().request_repaint(); // keep refreshing to see latest data
         }
 
-        add_space(ui);
-
         ui.horizontal(|ui| {
             ui.label("View:");
             ui.selectable_value(&mut self.view, View::Flamegraph, "Flamegraph");
             ui.selectable_value(&mut self.view, View::Stats, "Table");
         });
 
-        add_space(ui);
-
         match self.view {
             View::Flamegraph => flamegraph::ui(
                 ui,
@@ -880,7 +882,3 @@ fn max_num_latest_ui(ui: &mut egui::Ui, max_num_latest: &mut usize) {
         ui.add(egui::Slider::new(max_num_latest, 1..=100).logarithmic(true));
     });
 }
-
-fn add_space(ui: &mut Ui) {
-    ui.add_space(8.0); // Looks better than a separator
-}

puffin_egui/src/stats.rs

@@ -1,7 +1,7 @@
 use egui::TextBuffer;
 use puffin::*;
 
-use crate::{add_space, filter::Filter};
+use crate::filter::Filter;
 
 #[derive(Clone, Debug, Default)]
 pub struct Options {
@@ -31,23 +31,19 @@ pub fn ui(
         total_ns += scope.total_self_ns;
     }
 
-    ui.label("This view can be used to find functions that are called a lot.");
-    ui.label("The overhead of a profile scope is around ~50ns, so remove profile scopes from fast functions that are called often.");
+    ui.label("This view can be used to find functions that are called a lot.\n\
+              The overhead of a profile scope is around ~50ns, so remove profile scopes from fast functions that are called often.");
 
     ui.label(format!(
-        "Current frame: {} unique scopes, using a total of {:.1} kB, covering {:.1} ms over {} thread(s)",
+        "Currently viewing {} unique scopes, using a total of {:.1} kB, covering {:.1} ms over {} thread(s)",
         stats.scopes.len(),
         total_bytes as f32 * 1e-3,
         total_ns as f32 * 1e-6,
         threads.len()
     ));
 
-    add_space(ui);
-
     options.filter.ui(ui);
 
-    add_space(ui);
-
     let mut scopes: Vec<_> = stats
         .scopes
         .iter()

puffin_viewer/src/lib.rs

@@ -155,7 +155,6 @@ impl PuffinViewer {
         egui::TopBottomPanel::top("menu_bar").show(ctx, |ui| {
             egui::menu::bar(ui, |ui| {
                 egui::widgets::global_dark_light_mode_switch(ui);
-                ui.add_space(4.0);
 
                 ui.menu_button("File", |ui| {
                     if ui.button("Open…").clicked() {