move symbol size config to config-schema

Author: BR-

objdiff-core/config-schema.json

@@ -82,6 +82,27 @@
       "name": "Space between args",
       "description": "Adds a space between arguments in the diff output."
     },
+    {
+      "id": "showSymbolSizes",
+      "type": "choice",
+      "default": "off",
+      "name": "Show symbol sizes",
+      "description": "Shows symbol sizes in the symbol view.",
+      "items": [
+        {
+          "value": "off",
+          "name": "Off"
+        },
+        {
+          "value": "hex",
+          "name": "Hex"
+        },
+        {
+          "value": "decimal",
+          "name": "Decimal"
+        }
+      ]
+    },
     {
       "id": "combineDataSections",
       "type": "boolean",
@@ -296,6 +317,7 @@
       "properties": [
         "functionRelocDiffs",
         "demangler",
+        "showSymbolSizes",
         "spaceBetweenArgs",
         "combineDataSections",
         "combineTextSections"

objdiff-gui/src/app_config.rs

@@ -6,7 +6,7 @@ use objdiff_core::{
     config::ScratchConfig,
     diff::{
         ArmArchVersion, ArmR9Usage, DiffObjConfig, FunctionRelocDiffs, MipsAbi, MipsInstrCategory,
-        X86Formatter,
+        ShowSymbolSizes, X86Formatter,
     },
 };
 use typed_path::{Utf8PlatformPathBuf, Utf8UnixPathBuf};
@@ -227,6 +227,7 @@ pub struct DiffObjConfigV1 {
     pub relax_reloc_diffs: bool,
     #[serde(default = "bool_true")]
     pub space_between_args: bool,
+    pub show_symbol_sizes: ShowSymbolSizes,
     pub combine_data_sections: bool,
     // x86
     pub x86_formatter: X86Formatter,
@@ -248,6 +249,7 @@ impl Default for DiffObjConfigV1 {
         Self {
             relax_reloc_diffs: false,
             space_between_args: true,
+            show_symbol_sizes: Default::default(),
             combine_data_sections: false,
             x86_formatter: Default::default(),
             mips_abi: Default::default(),
@@ -272,6 +274,7 @@ impl DiffObjConfigV1 {
                 FunctionRelocDiffs::default()
             },
             space_between_args: self.space_between_args,
+            show_symbol_sizes: self.show_symbol_sizes,
             combine_data_sections: self.combine_data_sections,
             x86_formatter: self.x86_formatter,
             mips_abi: self.mips_abi,

objdiff-gui/src/views/appearance.rs

@@ -13,7 +13,6 @@ pub struct Appearance {
     pub diff_colors: Vec<Color32>,
     pub diff_bg_color: Option<Color32>,
     pub theme: egui::Theme,
-    pub show_symbol_sizes: ShowSymbolSizeState,
 
     // Applied by theme
     #[serde(skip)]
@@ -44,12 +43,6 @@ pub struct Appearance {
     pub next_code_font: Option<FontId>,
 }
 
-#[derive(serde::Deserialize, serde::Serialize, PartialEq, Debug)]
-pub enum ShowSymbolSizeState {
-    Off,
-    Decimal,
-    Hex,
-}
 pub struct FontState {
     definitions: egui::FontDefinitions,
     source: font_kit::source::SystemSource,
@@ -67,7 +60,6 @@ impl Default for Appearance {
             code_font: DEFAULT_CODE_FONT,
             diff_colors: DEFAULT_COLOR_ROTATION.to_vec(),
             theme: egui::Theme::Dark,
-            show_symbol_sizes: ShowSymbolSizeState::Off,
             text_color: Color32::GRAY,
             emphasized_text_color: Color32::LIGHT_GRAY,
             deemphasized_text_color: Color32::DARK_GRAY,
@@ -310,26 +302,6 @@ pub fn appearance_window(ctx: &egui::Context, show: &mut bool, appearance: &mut
             appearance,
         );
         ui.separator();
-        egui::ComboBox::from_label("Show symbol sizes")
-            .selected_text(format!("{:?}", appearance.show_symbol_sizes))
-            .show_ui(ui, |ui| {
-                ui.selectable_value(
-                    &mut appearance.show_symbol_sizes,
-                    ShowSymbolSizeState::Off,
-                    "Off",
-                );
-                ui.selectable_value(
-                    &mut appearance.show_symbol_sizes,
-                    ShowSymbolSizeState::Decimal,
-                    "Decimal",
-                );
-                ui.selectable_value(
-                    &mut appearance.show_symbol_sizes,
-                    ShowSymbolSizeState::Hex,
-                    "Hex",
-                );
-            });
-        ui.separator();
         ui.horizontal(|ui| {
             ui.label("Diff fill color:");
             let mut diff_bg_color =

objdiff-gui/src/views/diff.rs

@@ -665,6 +665,7 @@ fn diff_col_ui(
                 appearance,
                 column,
                 open_sections,
+                diff_config,
             ) {
                 match (column, action) {
                     (
@@ -703,6 +704,7 @@ fn diff_col_ui(
                 appearance,
                 column,
                 open_sections,
+                diff_config,
             ) {
                 ret = Some(result);
             }

objdiff-gui/src/views/symbol_diff.rs

@@ -6,7 +6,7 @@ use egui::{
 };
 use objdiff_core::{
     diff::{
-        ObjectDiff, SymbolDiff,
+        DiffObjConfig, ObjectDiff, ShowSymbolSizes, SymbolDiff,
         display::{
             HighlightKind, SectionDisplay, SymbolFilter, SymbolNavigationKind, display_sections,
             symbol_context, symbol_hover,
@@ -22,7 +22,7 @@ use crate::{
     hotkeys,
     jobs::{is_create_scratch_available, start_create_scratch},
     views::{
-        appearance::{Appearance, ShowSymbolSizeState},
+        appearance::Appearance,
         diff::{context_menu_items_ui, hover_items_ui},
         function_diff::FunctionViewState,
         write_text,
@@ -525,6 +525,7 @@ fn symbol_ui(
     state: &SymbolViewState,
     appearance: &Appearance,
     column: usize,
+    diff_config: &DiffObjConfig,
 ) -> Option<DiffViewAction> {
     let mut ret = None;
     let mut job = LayoutJob::default();
@@ -572,14 +573,14 @@ fn symbol_ui(
         write_text(") ", appearance.text_color, &mut job, appearance.code_font.clone());
     }
     write_text(name, appearance.highlight_color, &mut job, appearance.code_font.clone());
-    if appearance.show_symbol_sizes == ShowSymbolSizeState::Decimal {
+    if diff_config.show_symbol_sizes == ShowSymbolSizes::Decimal {
         write_text(
             &format!(" (size={})", symbol.size),
             appearance.deemphasized_text_color,
             &mut job,
             appearance.code_font.clone(),
         );
-    } else if appearance.show_symbol_sizes == ShowSymbolSizeState::Hex {
+    } else if diff_config.show_symbol_sizes == ShowSymbolSizes::Hex {
         write_text(
             &format!(" (size={:x})", symbol.size),
             appearance.deemphasized_text_color,
@@ -661,6 +662,7 @@ pub fn symbol_list_ui(
     appearance: &Appearance,
     column: usize,
     open_sections: Option<bool>,
+    diff_config: &DiffObjConfig,
 ) -> Option<DiffViewAction> {
     let mut ret = None;
     ScrollArea::both().auto_shrink([false, false]).show(ui, |ui| {
@@ -785,6 +787,7 @@ pub fn symbol_list_ui(
                                 state,
                                 appearance,
                                 column,
+                                diff_config,
                             ) {
                                 ret = Some(result);
                             }