encounter
/
objdiff
mirror of https://github.com/encounter/objdiff.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 0b7afa9f1e into 7aa878b48e

This commit is contained in:
LagoLunatic 2024-12-01 22:33:58 -07:00 committed by GitHub
parent 7aa878b48e 0b7afa9f1e
commit 221c1a8cda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

2
objdiff-gui/Cargo.toml
View File

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

4
objdiff-gui/src/views/function_diff.rs
View File

@ -149,6 +149,10 @@ fn ins_hover_ui(
ui.colored_label(appearance.highlight_color, "Extern".to_string()); 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());
}
}); });
} }

2
objdiff-gui/src/views/rlwinm.rs
View File

@ -19,7 +19,7 @@ pub fn rlwinm_decode_window(
if let Some(demangled) = rlwinmdec::decode(&state.text) { if let Some(demangled) = rlwinmdec::decode(&state.text) {
ui.scope(|ui| { ui.scope(|ui| {
ui.style_mut().override_text_style = Some(TextStyle::Monospace); 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() { if ui.button("Copy").clicked() {
ui.output_mut(|output| output.copied_text = demangled); ui.output_mut(|output| output.copied_text = demangled);