AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ui): theme remaining interface text

Browse source
This commit is contained in:
Hakan Seven 2026-07-28 12:29:31 +03:00
commit 2ac61bf99a
9 changed files with 119 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/ui/color_select.rs
View file

@ -140,6 +140,21 @@ pub fn color_selector<'a>(
})
}
fn list_row_style(theme: &Theme, status: button::Status) -> button::Style {
let palette = theme.extended_palette();
let hovered = matches!(status, button::Status::Hovered);
let text_color = if hovered {
palette.background.strong.text
} else {
palette.background.base.text
};
button::Style {
background: hovered.then_some(Background::Color(palette.background.strong.color)),
text_color,
..Default::default()
}
}
/// The colour list shown inside a picker popup: named ACI colours (with
/// swatches) plus a "More…" entry that opens the full palette window. Shared by
/// `color_selector` and the ribbon's colour overlay.
@ -156,12 +171,7 @@ pub fn color_list<'a>(
.align_y(iced::Center),
)
.on_press(on_select(color))
.style(|theme: &Theme, status| button::Style {
background: matches!(status, button::Status::Hovered).then_some(
Background::Color(theme.extended_palette().background.strong.color)
),
..Default::default()
})
.style(list_row_style)
.padding([2, 4])
.width(Length::Fill)
.into()
@ -180,12 +190,7 @@ pub fn color_list<'a>(
list = list.push(
button(text("More…").size(11))
.on_press(on_more)
.style(|theme: &Theme, status| button::Style {
background: matches!(status, button::Status::Hovered).then_some(
Background::Color(theme.extended_palette().background.strong.color)
),
..Default::default()
})
.style(list_row_style)
.padding([2, 4])
.width(Length::Fill),
);
@ -236,6 +241,7 @@ pub fn color_grid_window(on_pick: impl Fn(AcadColor) -> Message) -> Element<'sta
},
radius: 1.0.into(),
},
text_color: theme.extended_palette().background.base.text,
..Default::default()
})
.padding(0),

2
src/ui/properties.rs
View file

@ -951,6 +951,7 @@ pub fn color_picker_dropdown<'a>(
},
radius: 2.0.into(),
},
text_color: theme.extended_palette().background.base.text,
..Default::default()
})
.padding(0),
@ -1033,6 +1034,7 @@ pub fn color_picker_dropdown<'a>(
},
radius: 1.0.into(),
},
text_color: theme.extended_palette().background.base.text,
..Default::default()
})
.padding(0),

67
src/ui/window/layers.rs
View file

@ -475,6 +475,48 @@ impl LayerPanel {
// ── Sorting helpers ─────────────────────────────────────────────────────────
fn layer_cell_button_style(
theme: &Theme,
status: button::Status,
is_selected: bool,
index: usize,
) -> button::Style {
let palette = theme.extended_palette();
let highlighted = matches!(status, button::Status::Hovered);
let pair = if highlighted {
palette.background.strong
} else if is_selected {
palette.primary.weak
} else if index % 2 == 0 {
palette.background.base
} else {
palette.background.weak
};
button::Style {
background: highlighted.then_some(Background::Color(pair.color)),
text_color: pair.text,
..Default::default()
}
}
fn layer_header_button_style(theme: &Theme, status: button::Status) -> button::Style {
let palette = theme.extended_palette();
let highlighted = matches!(
status,
button::Status::Hovered | button::Status::Pressed
);
let pair = if highlighted {
palette.background.strong
} else {
palette.background.weak
};
button::Style {
background: highlighted.then_some(Background::Color(pair.color)),
text_color: pair.text,
..Default::default()
}
}
/// Packed RGB key for ordering colours deterministically by hue-ish bytes.
fn color_sort_key(c: Color) -> u32 {
let q = |v: f32| (v.clamp(0.0, 1.0) * 255.0).round() as u32;
@ -502,16 +544,7 @@ fn sortable_header<'a>(
}
button(content)
.on_press(Message::LayerSort(col))
.style(|theme: &Theme, status| button::Style {
background: matches!(
status,
button::Status::Hovered | button::Status::Pressed
)
.then_some(Background::Color(
theme.extended_palette().background.strong.color
)),
..Default::default()
})
.style(layer_header_button_style)
.padding(Padding {
top: 0.0,
bottom: 0.0,
@ -655,11 +688,8 @@ fn layer_row<'a>(
let svg_btn = |bytes: &'static [u8], on_press: Message| -> Element<'a, Message> {
button(crate::ui::icons::semantic(bytes, ICON_SZ))
.on_press(on_press)
.style(|theme: &Theme, status| button::Style {
background: matches!(status, button::Status::Hovered).then_some(
Background::Color(theme.extended_palette().background.strong.color)
),
..Default::default()
.style(move |theme: &Theme, status| {
layer_cell_button_style(theme, status, is_selected, index)
})
.padding(Padding {
top: COMBO_PAD_V,
@ -704,11 +734,8 @@ fn layer_row<'a>(
.size(FONT_SZ),
)
.on_press(Message::LayerRenameStart(index))
.style(|theme: &Theme, status| button::Style {
background: matches!(status, button::Status::Hovered).then_some(
Background::Color(theme.extended_palette().background.strong.color)
),
..Default::default()
.style(move |theme: &Theme, status| {
layer_cell_button_style(theme, status, is_selected, index)
})
.padding(Padding {
top: COMBO_PAD_V,