Merge pull request #254 from Urgau/text-anchor

Use text-anchor instead of hardcoded offsets
jonhoo · Jul 26, 2022 · 58ac796 · 58ac796
2 parents 2f74fe5 + 7385d4f
commit 58ac796
Show file tree

Hide file tree

Showing 46 changed files with 194 additions and 145 deletions.
diff --git a/src/flamegraph/flamegraph.css b/src/flamegraph/flamegraph.css
@@ -1,4 +1,5 @@
-#search { opacity:0.1; cursor:pointer; }
+#matched { text-anchor:end; }
+#search { text-anchor:end; opacity:0.1; cursor:pointer; }
 #search:hover, #search.show { opacity:1; }
 #subtitle { text-anchor:middle; font-color:rgb(160,160,160); }
 #unzoom { cursor:pointer; }

diff --git a/src/flamegraph/flamegraph.js b/src/flamegraph/flamegraph.js
@@ -40,8 +40,8 @@ function init(evt) {
 
             // Keep search elements at a fixed distance from right edge.
             var svgWidth = svg.width.baseVal.value;
-            searchbtn.attributes.x.value = svgWidth - xpad - 100;
-            matchedtxt.attributes.x.value = svgWidth - xpad - 100;
+            searchbtn.attributes.x.value = svgWidth - xpad;
+            matchedtxt.attributes.x.value = svgWidth - xpad;
         };
         window.addEventListener('resize', function() {
             update_for_width_change();

diff --git a/src/flamegraph/svg.rs b/src/flamegraph/svg.rs
@@ -244,7 +244,7 @@ text {{ font-family:{}; font-size:{}px; fill:rgb(0,0,0); }}
         svg,
         &mut buf,
         TextItem {
-            x: Dimension::Pixels(image_width as usize - super::XPAD - 100),
+            x: Dimension::Pixels(image_width as usize - super::XPAD),
             y: (opt.font_size * 2) as f64,
             text: "Search".into(),
             extra: vec![("id", "search")],
@@ -255,7 +255,7 @@ text {{ font-family:{}; font-size:{}px; fill:rgb(0,0,0); }}
         svg,
         &mut buf,
         TextItem {
-            x: Dimension::Pixels(image_width as usize - super::XPAD - 100),
+            x: Dimension::Pixels(image_width as usize - super::XPAD),
             y: (style_options.imageheight - (opt.ypad2() / 2)) as f64,
             text: " ".into(),
             extra: iter::once(("id", "matched")),

diff --git a/tests/data/flamegraph/austin/flame.svg b/tests/data/flamegraph/austin/flame.svg
diff --git a/tests/data/flamegraph/colors/async-profiler-java.svg b/tests/data/flamegraph/colors/async-profiler-java.svg
diff --git a/tests/data/flamegraph/colors/deterministic.svg b/tests/data/flamegraph/colors/deterministic.svg
diff --git a/tests/data/flamegraph/colors/java.svg b/tests/data/flamegraph/colors/java.svg
diff --git a/tests/data/flamegraph/colors/js.svg b/tests/data/flamegraph/colors/js.svg
diff --git a/tests/data/flamegraph/differential/diff-negated.svg b/tests/data/flamegraph/differential/diff-negated.svg
diff --git a/tests/data/flamegraph/differential/diff.svg b/tests/data/flamegraph/differential/diff.svg
diff --git a/tests/data/flamegraph/example-perf-stacks/example-perf-stacks.svg b/tests/data/flamegraph/example-perf-stacks/example-perf-stacks.svg
diff --git a/tests/data/flamegraph/factor/factor-2.5.svg b/tests/data/flamegraph/factor/factor-2.5.svg
diff --git a/tests/data/flamegraph/flamechart/flame.svg b/tests/data/flamegraph/flamechart/flame.svg
diff --git a/tests/data/flamegraph/fractional-samples/fractional-reversed.svg b/tests/data/flamegraph/fractional-samples/fractional-reversed.svg
diff --git a/tests/data/flamegraph/grey-frames/grey-frames.svg b/tests/data/flamegraph/grey-frames/grey-frames.svg
diff --git a/tests/data/flamegraph/inverted/inverted.svg b/tests/data/flamegraph/inverted/inverted.svg
diff --git a/tests/data/flamegraph/nameattr/nameattr.svg b/tests/data/flamegraph/nameattr/nameattr.svg
diff --git a/tests/data/flamegraph/nameattr/nameattr_duplicate_attributes.svg b/tests/data/flamegraph/nameattr/nameattr_duplicate_attributes.svg
diff --git a/tests/data/flamegraph/narrow-blocks/narrow-blocks.svg b/tests/data/flamegraph/narrow-blocks/narrow-blocks.svg
diff --git a/tests/data/flamegraph/options/colordiffusion.svg b/tests/data/flamegraph/options/colordiffusion.svg