Data diff view: Make rows show offset within the symbol, not within the section

Author: LagoLunatic

objdiff-gui/src/views/data_diff.rs

@@ -115,7 +115,8 @@ fn get_hover_item_color_for_diff_kind(diff_kind: DataDiffKind) -> HoverItemColor
 pub(crate) fn data_row_ui(
     ui: &mut egui::Ui,
     obj: Option<&Object>,
-    address: usize,
+    base_address: usize,
+    row_address: usize,
     diffs: &[(DataDiff, Vec<DataRelocationDiff>)],
     appearance: &Appearance,
     column: usize,
@@ -127,15 +128,15 @@ pub(crate) fn data_row_ui(
     }
     let mut job = LayoutJob::default();
     write_text(
-        format!("{address:08x}: ").as_str(),
+        format!("{row_address:08x}: ").as_str(),
         appearance.text_color,
         &mut job,
         appearance.code_font.clone(),
     );
     // The offset shown on the side of the GUI, shifted by insertions/deletions.
     let mut cur_addr = 0usize;
     // The offset into the actual bytes of the section on this side, ignoring differences.
-    let mut cur_addr_actual = address;
+    let mut cur_addr_actual = base_address + row_address;
     for (diff, reloc_diffs) in diffs {
         let base_color = get_color_for_diff_kind(diff.kind, appearance);
         if diff.data.is_empty() {

objdiff-gui/src/views/diff.rs

@@ -507,13 +507,14 @@ pub fn diff_view_ui(
                 total_rows,
                 |row, column| {
                     let i = row.index();
-                    let address = i * BYTES_PER_ROW;
+                    let row_offset = i * BYTES_PER_ROW;
                     row.col(|ui| {
                         if column == 0 {
                             data_row_ui(
                                 ui,
                                 Some(left_obj),
-                                address + left_symbol.address as usize,
+                                left_symbol.address as usize,
+                                row_offset,
                                 &left_diffs[i],
                                 appearance,
                                 column,
@@ -522,7 +523,8 @@ pub fn diff_view_ui(
                             data_row_ui(
                                 ui,
                                 Some(right_obj),
-                                address + right_symbol.address as usize,
+                                right_symbol.address as usize,
+                                row_offset,
                                 &right_diffs[i],
                                 appearance,
                                 column,
@@ -642,12 +644,13 @@ fn diff_col_ui(
                     total_rows,
                     |row, _column| {
                         let i = row.index();
-                        let address = i * BYTES_PER_ROW;
+                        let row_offset = i * BYTES_PER_ROW;
                         row.col(|ui| {
                             data_row_ui(
                                 ui,
                                 Some(obj),
-                                address + symbol.address as usize,
+                                symbol.address as usize,
+                                row_offset,
                                 &diffs[i],
                                 appearance,
                                 column,