Merge 0b7afa9f1e into 7aa878b48e

.gitignore

@@ -18,4 +18,4 @@ android.keystore
 *.frag
 *.vert
 *.metal
-.vscode/launch.json
+.vscode/

objdiff-gui/Cargo.toml

@@ -95,7 +95,7 @@ exec = "0.3"
 
 # native:
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-tracing-subscriber = "0.3"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # web:
 [target.'cfg(target_arch = "wasm32")'.dependencies]

objdiff-gui/src/views/function_diff.rs

@@ -149,6 +149,10 @@ fn ins_hover_ui(
                 ui.colored_label(appearance.highlight_color, "Extern".to_string());
             }
         }
+
+        if let Some(demangled) = rlwinmdec::decode(&ins.formatted) {
+            ui.colored_label(appearance.highlight_color, demangled.trim());
+        }
     });
 }
 

objdiff-gui/src/views/rlwinm.rs

@@ -19,7 +19,7 @@ pub fn rlwinm_decode_window(
         if let Some(demangled) = rlwinmdec::decode(&state.text) {
             ui.scope(|ui| {
                 ui.style_mut().override_text_style = Some(TextStyle::Monospace);
-                ui.colored_label(appearance.replace_color, &demangled);
+                ui.colored_label(appearance.replace_color, demangled.trim());
             });
             if ui.button("Copy").clicked() {
                 ui.output_mut(|output| output.copied_text = demangled);