encounter/objdiff
1
0
Fork 0
mirror of https://github.com/encounter/objdiff.git synced 2025-12-17 00:47:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade all dependencies (incl. egui)

Browse Source
This commit is contained in:
Luke Street
2025-11-18 22:21:46 -07:00
parent b2dcecc5d8
commit 827f4a42bd
12 changed files with 787 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
objdiff-gui/src/main.rs
View File

@@ -14,6 +14,7 @@ mod views;
use std::{
ffi::OsStr,
fmt::Display,
io::Cursor,
path::PathBuf,
process::ExitCode,
rc::Rc,
@@ -21,7 +22,7 @@ use std::{
sync::{Arc, Mutex},
};
use anyhow::{Result, ensure};
use anyhow::{Context, Result, ensure};
use argp::{FromArgValue, FromArgs};
use cfg_if::cfg_if;
use objdiff_core::config::path::check_path_buf;
@@ -90,9 +91,9 @@ struct TopLevel {
}
fn load_icon() -> Result<egui::IconData> {
let decoder = png::Decoder::new(include_bytes!("../assets/icon_64.png").as_ref());
let decoder = png::Decoder::new(Cursor::new(include_bytes!("../assets/icon_64.png").as_ref()));
let mut reader = decoder.read_info()?;
let mut buf = vec![0; reader.output_buffer_size()];
let mut buf = vec![0; reader.output_buffer_size().context("Buffer too large")?];
let info = reader.next_frame(&mut buf)?;
ensure!(info.bit_depth == png::BitDepth::Eight);
ensure!(info.color_type == png::ColorType::Rgba);

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

@@ -104,7 +104,7 @@ impl FrameHistory {
));
let cpu_usage = to_screen.inverse().transform_pos(pointer_pos).y;
let text = format!("{:.1} ms", 1e3 * cpu_usage);
shapes.push(ui.fonts(|f| {
shapes.push(ui.fonts_mut(|f| {
Shape::text(
f,
pos2(rect.left(), y),

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

@@ -217,7 +217,7 @@ fn asm_row_ui(
if ins_diff.kind != InstructionDiffKind::None {
ui.painter().rect_filled(ui.available_rect_before_wrap(), 0.0, ui.visuals().faint_bg_color);
}
let space_width = ui.fonts(|f| f.glyph_width(&appearance.code_font, ' '));
let space_width = ui.fonts_mut(|f| f.glyph_width(&appearance.code_font, ' '));
display_row(obj, symbol_idx, ins_diff, diff_config, |segment| {
if let Some(action) =
diff_text_ui(ui, segment, appearance, ins_view_state, column, space_width, &response_cb)