Merge branch 'HakanSeven12:main' into main

src/ui/window/about.rs

@@ -1,14 +1,9 @@
 use crate::app::Message;
 use crate::t;
+use crate::ui::style::common::muted_style;
 use iced::widget::{button, column, container, row, svg, text, Space};
 use iced::{Background, Border, Element, Fill, Length, Shrink, Theme};
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn primary_style(theme: &Theme) -> iced::widget::text::Style {
     iced::widget::text::Style {
         color: Some(theme.palette().primary.base.color),

src/ui/window/alias_editor.rs

@@ -7,6 +7,7 @@
 //! unsaved-changes guard on close.
 
 use crate::app::Message;
+use crate::ui::style::common::muted_style;
 use iced::widget::{button, column, container, row, scrollable, text, text_input, Space};
 use iced::{Background, Element, Length, Theme};
 use crate::t;
@@ -21,12 +22,6 @@ pub enum AliasField {
 /// Right-hand lane reserved for the scrollbar so it never overlaps the ✕ column.
 const GUTTER: f32 = 16.0;
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn danger_text_style(theme: &Theme) -> iced::widget::text::Style {
     iced::widget::text::Style {
         color: Some(theme.palette().danger.base.color),

src/ui/window/attribute_editor.rs

@@ -25,6 +25,8 @@ use std::borrow::Cow;
 use std::fmt;
 
 use crate::ui::properties::{lw_options, LwItem};
+use crate::ui::style::common::muted_style;
+use crate::ui::style::form::hdivider;
 
 const LABEL_W: f32 = 120.0;
 
@@ -139,12 +141,6 @@ pub fn color_from_label(label: &str) -> Option<AcadColor> {
     })
 }
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn field_style(theme: &Theme, status: text_input::Status) -> text_input::Style {
     let palette = theme.palette();
     let border = match status {
@@ -161,20 +157,6 @@ fn field_style(theme: &Theme, status: text_input::Status) -> text_input::Style {
     }
 }
 
-/// Horizontal 1px divider in the shared border colour (matches style windows).
-fn hdivider<'a>(width: Length) -> Element<'a, Message> {
-    container(Space::new().width(width).height(1))
-        .width(width)
-        .height(1)
-        .style(|theme: &Theme| container::Style {
-            background: Some(Background::Color(
-                theme.palette().background.neutral.color
-            )),
-            ..Default::default()
-        })
-        .into()
-}
-
 /// One `label : widget` row with a fixed-width label column.
 fn field_row<'a>(
     label: Cow<'static, str>,

src/ui/window/layers.rs

@@ -2,6 +2,7 @@
 
 use crate::app::Message;
 use crate::ui::properties::{lw_options, LinetypeItem, LwItem};
+use crate::ui::style::common::muted_style;
 use crate::ui::ROW_H;
 use acadrust::tables::layer::Layer as DocLayer;
 use acadrust::tables::Table;
@@ -51,12 +52,6 @@ const LINETYPE_MENU_W: f32 = 220.0;
 /// scrolled into view after it is added (#271).
 pub const LAYER_TABLE_SCROLL_ID: &str = "layer-manager-table-scroll";
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn table_input_style(
     theme: &Theme,
     status: iced::widget::text_input::Status,

src/ui/window/layout_manager.rs

@@ -1,16 +1,12 @@
 //! Layout Manager window — fills the entire OS window.
 
 use crate::app::Message;
+use crate::ui::style::common::muted_style;
+use crate::ui::style::form::{hdivider, vsep};
 use iced::widget::{button, column, container, row, scrollable, text, text_input, Space};
 use iced::{Background, Element, Theme};
 use crate::t;
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn primary_style(theme: &Theme) -> iced::widget::text::Style {
     iced::widget::text::Style {
         color: Some(theme.palette().primary.base.color),
@@ -37,32 +33,6 @@ fn list_item(active: bool) -> impl Fn(&Theme, button::Status) -> button::Style {
     }
 }
 
-fn hdivider<'a>(width: iced::Length) -> Element<'a, Message> {
-    container(Space::new().width(width).height(1))
-        .width(width)
-        .height(1)
-        .style(|theme: &Theme| container::Style {
-            background: Some(Background::Color(
-                theme.palette().background.neutral.color,
-            )),
-            ..Default::default()
-        })
-        .into()
-}
-
-fn vsep<'a>(height: iced::Length) -> Element<'a, Message> {
-    container(Space::new().width(1).height(height))
-        .width(1)
-        .height(height)
-        .style(|theme: &Theme| container::Style {
-            background: Some(Background::Color(
-                theme.palette().background.neutral.color,
-            )),
-            ..Default::default()
-        })
-        .into()
-}
-
 pub fn view_window<'a>(
     layouts: Vec<String>,
     selected: &'a str,

src/ui/window/named_parameters.rs

@@ -17,6 +17,7 @@ use crate::app::Message;
 use crate::scene::named_parameters::ParameterTable;
 use crate::scene::Scene;
 use crate::t;
+use crate::ui::style::common::muted_style;
 use acadrust::types::Handle;
 use acadrust::EntityType;
 use iced::widget::tooltip::Position as TipPos;
@@ -113,12 +114,6 @@ pub struct ParamEditorRow {
 /// column — same convention and value as `alias_editor::GUTTER`.
 const GUTTER: f32 = 16.0;
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn danger_style(theme: &Theme) -> iced::widget::text::Style {
     iced::widget::text::Style {
         color: Some(theme.palette().danger.base.color),

src/ui/window/plot.rs

@@ -9,6 +9,7 @@ use crate::io::paper_catalog::{self, CustomPaper, Margins, PaperSize, PaperUnits
 use crate::io::plot_device::PrinterCapabilities;
 use crate::ui::style::common::muted_style;
 use crate::ui::style::form;
+use crate::ui::style::form::{hdivider, vseparator as vsep};
 use iced::widget::{
     button, checkbox, column, container, mouse_area, row, scrollable, text, text_input,
     Space,
@@ -543,18 +544,10 @@ fn btn(accent: bool) -> impl Fn(&Theme, button::Status) -> button::Style {
     form::button_style(accent)
 }
 
-fn hdivider<'a>(width: Length) -> Element<'a, Message> {
-    form::hdivider(width)
-}
-
 fn section_label<'a>(s: Cow<'static, str>) -> Element<'a, Message> {
     form::section_label(s)
 }
 
-fn vsep<'a>(height: Length) -> Element<'a, Message> {
-    form::vseparator(height)
-}
-
 fn setup_row<'a>(
     name: &'a str,
     selected: &str,

src/ui/window/plugin_manager.rs

@@ -8,6 +8,7 @@
 
 use crate::app::Message;
 use crate::plugin::external::{ExternalPlugin, RegistryEntry, ReleaseInfo};
+use crate::ui::style::common::muted_style;
 use iced::widget::{
     button, column, container, markdown, row, rule, scrollable, text, text_input, Space,
 };
@@ -48,12 +49,6 @@ inventory::submit!(crate::command::CommandRegistration {
     names: &["PLUGINS", "PLUGINMANAGER"]
 });
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn primary_style(theme: &Theme) -> iced::widget::text::Style {
     iced::widget::text::Style {
         color: Some(theme.palette().primary.base.color),

src/ui/window/print_all.rs

@@ -1,5 +1,6 @@
 use crate::app::Message;
 use crate::t;
+use crate::ui::style::common::muted_style as muted;
 use iced::widget::{button, checkbox, column, container, row, scrollable, text, Space};
 use iced::{Background, Border, Element, Length, Theme};
 
@@ -13,12 +14,6 @@ fn button_style(primary: bool) -> impl Fn(&Theme, button::Status) -> button::Sty
     }
 }
 
-fn muted(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 pub fn view_window<'a>(
     layouts: &'a [(String, bool)],
     printer: Option<&'a str>,

src/ui/window/recovery.rs

@@ -1,14 +1,9 @@
 use crate::app::Message;
 use crate::io::recovery::{RecoveryReport, RecoveryStatus};
+use crate::ui::style::common::muted_style;
 use iced::widget::{button, column, container, row, scrollable, text, Space};
 use iced::{Background, Border, Element, Fill, Length, Shrink, Theme};
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn status_style(
     status: RecoveryStatus,
 ) -> impl Fn(&Theme) -> iced::widget::text::Style + Copy {

src/ui/window/shortcuts.rs

@@ -2,6 +2,7 @@
 
 use crate::app::Message;
 use crate::t;
+use crate::ui::style::common::muted_style;
 use iced::widget::{button, column, container, row, scrollable, text, text_input, Space};
 use iced::{Background, Element, Length, Theme};
 
@@ -13,12 +14,6 @@ pub enum ShortcutField {
 
 const GUTTER: f32 = 16.0;
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn danger_text_style(theme: &Theme) -> iced::widget::text::Style {
     iced::widget::text::Style {
         color: Some(theme.palette().danger.base.color),

src/ui/window/update_notice.rs

@@ -1,15 +1,10 @@
 use crate::app::Message;
+use crate::ui::style::common::muted_style;
 use iced::widget::{button, column, container, row, scrollable, text, Space};
 use iced::{Background, Border, Element, Theme};
 use crate::t;
 use std::borrow::Cow;
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn primary_style(theme: &Theme) -> iced::widget::text::Style {
     iced::widget::text::Style {
         color: Some(theme.palette().primary.base.color),

src/ui/window/xref_help.rs

@@ -5,6 +5,7 @@
 //! unreadable sliver.
 
 use crate::app::Message;
+use crate::ui::style::common::muted_style;
 use iced::widget::{button, column, container, row, text, Space};
 use iced::{Background, Element, Fill, Length, Theme};
 
@@ -12,12 +13,6 @@ use iced::{Background, Element, Fill, Length, Theme};
 /// missing or broken behavior where it will be seen.
 pub const XREF_ISSUES_URL: &str = "https://github.com/HakanSeven12/OpenCADStudio/issues";
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 pub fn view_window(sizing: crate::ui::modal::ModalSizing) -> Element<'static, Message> {
     // Fixed window width: paragraphs wrap against this instead of the
     // toolbar, which is what made the dropdown unreadable.

src/ui/window/xref_manager.rs

@@ -9,6 +9,7 @@ use crate::app::Message;
 use crate::io::xref::collect_entries_with_prev;
 use crate::io::xref_model::{normalize_lexical, Pathtype, RefKind, RefStatus, RefType, ReferenceEntry};
 use crate::ui::ROW_H;
+use crate::ui::style::common::muted_style;
 use acadrust::CadDocument;
 use iced::widget::{button, column, container, mouse_area, row, scrollable, text, tooltip};
 use iced::Padding;
@@ -1286,12 +1287,6 @@ fn format_date(modified: Option<SystemTime>) -> String {
 
 // ── Widget helpers (layers.rs conventions) ────────────────────────────────
 
-fn muted_style(theme: &Theme) -> iced::widget::text::Style {
-    iced::widget::text::Style {
-        color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
-    }
-}
-
 fn row_button_style(selected: bool, index: usize) -> impl Fn(&Theme, button::Status) -> button::Style {
     move |theme: &Theme, status: button::Status| {
         let palette = theme.palette();