Merge pull request #161 from itamarst/159-show-subtitle

Adjust height based on subtitle.

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Fix bug where subtitles would often be hidden ([#161](https://github.com/jonhoo/inferno/pull/161) by [@itamarst](https://github.com/itamarst))
+
 ### Removed
 
 ## [0.9.3] - 2020-02-02

src/flamegraph/mod.rs

@@ -235,9 +235,14 @@ pub struct Options<'a> {
 }
 
 impl<'a> Options<'a> {
-    /// Calculate pad top, including title
+    /// Calculate pad top, including title and subtitle
     pub(super) fn ypad1(&self) -> usize {
-        self.font_size * 3
+        let subtitle_height = if let Some(_) = self.subtitle {
+            self.font_size * 2
+        } else {
+            0
+        };
+        self.font_size * 3 + subtitle_height
     }
 
     /// Calculate pad bottom, including labels
@@ -827,3 +832,22 @@ fn write_usize(buffer: &mut StrStack, value: usize) -> usize {
     itoa::fmt(&mut writer, value).unwrap();
     writer.finish()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::Options;
+
+    #[test]
+    fn top_ypadding_adjusts_for_subtitle() {
+        let height_without_subtitle = Options {
+            ..Default::default()
+        }
+        .ypad1();
+        let height_with_subtitle = Options {
+            subtitle: Some(String::from("hello!")),
+            ..Default::default()
+        }
+        .ypad1();
+        assert!(height_with_subtitle > height_without_subtitle);
+    }
+}