Dialogs: add paragraph indentation and alignment to Modify Style (#5833)

crates/engine/src/cmd/para/lists.rs

@@ -172,6 +172,12 @@ fn own_format(st: &Style) -> Value {
     if let Some(x) = pp.indent_left {
         f.insert("indentLeft".into(), json!(x));
     }
+    if let Some(x) = pp.indent_right {
+        f.insert("indentRight".into(), json!(x));
+    }
+    if let Some(x) = pp.indent_first {
+        f.insert("indentFirst".into(), json!(x));
+    }
     if let Some(LineSpacing::Multiple(m)) = pp.line_spacing {
         f.insert("lineSpacing".into(), json!(m));
     }

crates/engine/src/cmd/para/styles.rs

@@ -107,6 +107,8 @@ pub(super) fn create_style(s: &mut Session, v: &Value) -> CmdResult {
     Ok(json!({"id": id}))
 }
 
+/// Modifies an existing style's character, paragraph, or name/next properties, updating
+/// all affected paragraphs across the document.
 pub(super) fn modify_style(s: &mut Session, v: &Value) -> CmdResult {
     let id = style_id(s, p::req_str(v, "style")?)?;
     let chr: Option<CharProps> = v.get("chr").map(|c| serde_json::from_value(c.clone())).transpose().map_err(|e| CmdError::Params(e.to_string()))?;
@@ -120,6 +122,7 @@ pub(super) fn modify_style(s: &mut Session, v: &Value) -> CmdResult {
     }
     if let Some(pp) = para {
         st.para.overlay(&pp);
+        st.para.cancel_char_indents(pp.indent_left.is_some(), pp.indent_right.is_some(), pp.indent_first.is_some());
     }
     if let Some(n) = next {
         st.next = Some(n);

crates/ui-egui/src/dialogs.rs

@@ -243,21 +243,63 @@ pub enum Dialog {
         #[serde(skip)]
         back: bool,
     },
+    /// Modify Style dialog: change name, character properties (Font tab), and for paragraph
+    /// styles, alignment, indents, and spacing (Paragraph tab).
     ModifyStyle {
+        /// Return to Manage Styles on close.
         #[serde(skip)]
         back: bool,
         /// The dialog that comes back when this closes (Table of Contents › Modify…).
         #[serde(skip)]
         resume: Option<Box<Dialog>>,
+        /// Style id.
         id: String,
+        /// User-visible style name.
         name: String,
+        /// Font family name.
         font: String,
+        /// Font size in points.
         size: f32,
+        /// Bold flag.
         bold: bool,
+        /// Italic flag.
         italic: bool,
+        /// Font color (hex or "auto").
         color: String,
+        /// Space before in points.
         before: f32,
+        /// Space after in points.
         after: f32,
+        /// Visual alignment: left, center, right, justify.
+        #[serde(default)]
+        align: String,
+        /// Left indent in current measurement unit.
+        #[serde(default)]
+        left: f32,
+        /// Right indent in current measurement unit.
+        #[serde(default)]
+        right: f32,
+        /// First-line indent in current measurement unit (negative = hanging).
+        #[serde(default)]
+        first: f32,
+        /// Line spacing as multiple.
+        #[serde(default)]
+        line: f32,
+        /// Non-multiple line spacing (Exactly or At Least) if the style had one when opened (#5833).
+        #[serde(default)]
+        non_multiple_line: Option<wordcraft_doc::props::LineSpacing>,
+        /// True if this is a character style (paragraph formatting disabled).
+        #[serde(default)]
+        is_char: bool,
+        /// Right-to-left paragraph text direction.
+        #[serde(default)]
+        bidi: bool,
+        /// Current tab index: 0 Font, 1 Paragraph.
+        #[serde(default)]
+        tab: u8,
+        /// Fields as they were when the dialog opened, to send only what changed (#5833).
+        #[serde(skip)]
+        start: serde_json::Map<String, Value>,
     },
     /// Manage Styles: every style with its preview and description; modify, create, delete and
     /// show or hide them.
@@ -876,6 +918,8 @@ impl Dialog {
         Dialog::PasteSpecial { formats, choice: 0, payload: kept, note }
     }
 
+    /// Opens the Modify Style dialog for style `id`, prefilling its character properties and,
+    /// for paragraph styles, its paragraph alignment, indentation, spacing, and line spacing.
     pub fn modify_style(app: &WordApp, id: &str) -> Option<Dialog> {
         let st = app.session.doc.styles.get(id)?;
         let rc = app.session.doc.styles.resolve_char(
@@ -886,6 +930,34 @@ impl Dialog {
             },
         );
         let rp = app.session.doc.styles.resolve_para(&wordcraft_doc::ParaProps { style: Some(id.into()), ..Default::default() });
+        let is_char = st.kind == wordcraft_doc::StyleKind::Character;
+        let (line, non_multiple_line) = match rp.line_spacing {
+            wordcraft_doc::props::LineSpacing::Multiple(m) => (m, None),
+            other => (1.0, Some(other)),
+        };
+        let (vl, vr) = rp.visual_indents();
+        let unit = crate::options::unit().pt_per_unit();
+        let color = match rc.color {
+            wordcraft_doc::TextColor::Rgb(c) => c.hex(),
+            wordcraft_doc::TextColor::Auto => "auto".into(),
+        };
+        let align = format!("{:?}", rp.align.visual(rp.bidi)).to_lowercase();
+        let left = vl / unit;
+        let right = vr / unit;
+        let first = rp.indent_first / unit;
+        let before = rp.space_before;
+        let after = rp.space_after;
+
+        let start = modify_style_start(
+            &st.name,
+            &rc.font,
+            rc.size,
+            rc.bold,
+            rc.italic,
+            &color,
+            (!is_char).then_some((align.as_str(), left, right, first, before, after, line, non_multiple_line.is_some())),
+        );
+
         Some(Dialog::ModifyStyle {
             back: false,
             resume: None,
@@ -895,16 +967,54 @@ impl Dialog {
             size: rc.size,
             bold: rc.bold,
             italic: rc.italic,
-            color: match rc.color {
-                wordcraft_doc::TextColor::Rgb(c) => c.hex(),
-                wordcraft_doc::TextColor::Auto => "auto".into(),
-            },
-            before: rp.space_before,
-            after: rp.space_after,
+            color,
+            before,
+            after,
+            align,
+            left,
+            right,
+            first,
+            line,
+            non_multiple_line,
+            is_char,
+            bidi: rp.bidi,
+            tab: 0,
+            start,
         })
     }
 }
 
+/// Builds the baseline map of style properties used by the Modify Style dialog
+/// to detect and save only fields that changed on OK (#5833).
+pub(crate) fn modify_style_start(
+    name: &str,
+    font: &str,
+    size: f32,
+    bold: bool,
+    italic: bool,
+    color: &str,
+    para: Option<(&str, f32, f32, f32, f32, f32, f32, bool)>,
+) -> serde_json::Map<String, Value> {
+    let mut start = serde_json::Map::new();
+    start.insert("name".into(), json!(name));
+    start.insert("font".into(), json!(font));
+    start.insert("size".into(), json!(size));
+    start.insert("bold".into(), json!(bold));
+    start.insert("italic".into(), json!(italic));
+    start.insert("color".into(), json!(color));
+    if let Some((align, left, right, first, before, after, line, non_multiple)) = para {
+        start.insert("align".into(), json!(align));
+        start.insert("left".into(), json!(left));
+        start.insert("right".into(), json!(right));
+        start.insert("first".into(), json!(first));
+        start.insert("before".into(), json!(before));
+        start.insert("after".into(), json!(after));
+        start.insert("line".into(), json!(line));
+        start.insert("lineRule".into(), json!(if non_multiple { "non_multiple" } else { "multiple" }));
+    }
+    start
+}
+
 pub mod dialogs_chart;
 pub mod dialogs_controls;
 pub mod dialogs_insert;