Merge "ui: Change search hotkey to '/'" into main
diff --git a/tools/gn_utils.py b/tools/gn_utils.py
index 904760e..4fb0083 100644
--- a/tools/gn_utils.py
+++ b/tools/gn_utils.py
@@ -176,6 +176,7 @@
e.g., //src/perfetto:tests -> src_perfetto_tests
"""
name = re.sub(r'^//:?', '', label)
+ name = re.sub(r'/:', '/', name)
name = re.sub(r'[^a-zA-Z0-9_]', '_', name)
return name
diff --git a/ui/src/assets/details.scss b/ui/src/assets/details.scss
index ff66708..55a2cd9 100644
--- a/ui/src/assets/details.scss
+++ b/ui/src/assets/details.scss
@@ -453,11 +453,16 @@
font-size: 11px;
font-family: var(--monospace-font);
- .colour {
- display: inline-block;
- height: 10px;
- width: 10px;
- margin-right: 4px;
+ .pf-ftrace-namebox {
+ display: flex;
+ align-items: center;
+
+ .pf-ftrace-colorbox {
+ display: inline-block;
+ height: 10px;
+ width: 10px;
+ margin-right: 4px;
+ }
}
}
diff --git a/ui/src/assets/widgets/virtual_table.scss b/ui/src/assets/widgets/virtual_table.scss
index acd22d5..9057db8 100644
--- a/ui/src/assets/widgets/virtual_table.scss
+++ b/ui/src/assets/widgets/virtual_table.scss
@@ -67,6 +67,8 @@
.pf-vtable-puck {
.pf-vtable-row {
+ display: flex;
+ align-items: center;
white-space: nowrap;
padding-inline: 4px;
diff --git a/ui/src/tracks/ftrace/ftrace_explorer.ts b/ui/src/tracks/ftrace/ftrace_explorer.ts
index 5e7eb32..d8cad78 100644
--- a/ui/src/tracks/ftrace/ftrace_explorer.ts
+++ b/ui/src/tracks/ftrace/ftrace_explorer.ts
@@ -188,7 +188,11 @@
cells: [
id,
timestamp,
- m('', m('span.colour', {style: {background: color}}), name),
+ m(
+ '.pf-ftrace-namebox',
+ m('.pf-ftrace-colorbox', {style: {background: color}}),
+ name,
+ ),
cpu,
process,
args,
